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
Change-Id: I433fcb87accb5bc3bfb6926befa34027e67dfe4f