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

Change-Id: I6b57701a4817d8bd43179194cc443de70cd94ee7