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

Change-Id: Ic8b5c9cecc387023bc0805f043fc02bf9850e144