Partially revert "Patch to make it compile against JUnit 4.10 and run on Android" am: ea07fbce am: cad05b70 am: 4f3ba934 Change-Id: I700e33a147deee5aae6b933ec84dd5bcd4deeffa
mentioned in commit f29c61a5