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

Change-Id: I93f76bb45e1ce382d02076a5841a44eeaeac10fd