tree bf730f5600a54ec6c07b9f1ce10abb48589a79ef
parent 2eb7ea4dd496b1a4f0d2917092faec2c53df76ba
author Paul Duffin <paulduffin@google.com> 1481724760 +0000
committer Paul Duffin <paulduffin@google.com> 1481901889 +0000

Partially revert "Patch to make it compile against JUnit 4.10 and run on Android"

This partially reverts commit 6774bdc0447b72a618eab51772685010afd5647a.

Bug: 33613916
Test: make checkbuild
Change-Id: Iac008952ff1a0e6f89d8862e817a8b2480dcbb28