Revert "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 031b913e17 am: 3173cc34c7 am: 9ea489ac77
am: 4406105ad1

Change-Id: Ia57d62e20c7dc192c4a583021e6afc9a53cb1e90