Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: 75df705a0f

Change-Id: I5bba3b8e302bc7e3500eca46c5d31b1b0e3819e3