Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: cd7eb92ee2 am: 85e4fe1b88
am: 244906d5d0  -s ours

Change-Id: I5cdbc0652033f3ae9680b5ecad042e4488d23469