Prepare for removal of junit and android.test classes from Android API (step 1) am: fb7f099c03
am: 89dde72146

Change-Id: I2d625aa760e0060abca2c1c5b26466be2003822b