Prepare for removal of junit and android.test classes from Android API (step...
Prepare for removal of junit and android.test classes from Android API (step 1) am: fb7f099c am: 89dde721
am: 1261965d
Change-Id: I6892505574c8a081514559e3c18900d839e04b22