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

Change-Id: I4c84422ce8535a73a5981b6f6f2cd6b574ab66ab