Merge "Minor changes to JUnit 4.10 to make it more like 4.12" am: 26401927 am: de7e6978 am: b51c9101 am: 9fbd3a0d Change-Id: I6bbb97856cbef29593c8ac41ce18e03cc5c9b356