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

Change-Id: I47886fa141b68b021c036715760132b607509881