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

Change-Id: Ie19328205f8a649f8dce9cdc1cb73a0be212aa41