Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d am: edefe593e3
am: 5d43c16797  -s ours

Change-Id: I077e5c803f06c2ae994514850ee64c18a57a81eb