Prepare for removal of junit and android.test classes from Android API (step...
Prepare for removal of junit and android.test classes from Android API (step 1) am: bb53fd26 am: decae510
am: f5d49093
Change-Id: I046af09165cfb997465f1fbeda8fbd71147c6df0