Merge "Minor changes to JUnit 4.10 to make it more like 4.12"
am: 26401927b8

Change-Id: If4350a64fcf559a513154178bd74eca9fdd5b5b6