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

Change-Id: I1ab6197838d332085465af6ccd158799c4ca1b6d