Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63 Former-commit-id: 121d9a02acfe528c524788a062c2d2034f80afe5
Amend: Publish JUnit test reports as XML, in support of Jenkins. Fix build/merge of 13.3.1 code so it compiles. Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4 Former-commit-id: 60efd125706d618ae06eb84f959302213da2f7f1
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf