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

Change-Id: I433fcb87accb5bc3bfb6926befa34027e67dfe4f