Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: a80a70f2f8 am: 810eb447e9 am: 3db794bafd
am: 090ce68cee

Change-Id: I2534a594a4f84a5a68463868f70093e0276cf125