Revert "Prepare for removal of junit and android.test classes from Android API...
Revert "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 031b913e am: 3173cc34 am: 9ea489ac
am: 4406105a
Change-Id: Ia57d62e20c7dc192c4a583021e6afc9a53cb1e90