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

Change-Id: I914b9f33b8b4ba09fb71fa11f4e71994a12c276d