Partially revert "Patch to make it compile against JUnit 4.10 and run on...
Partially revert "Patch to make it compile against JUnit 4.10 and run on Android" am: ea07fbce am: cad05b70 am: 4f3ba934
am: 327d6aab
Change-Id: I73a337bdf0f7788693de2d2d05540566cd06a1e8