Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: f2d90cc8d8 am: b017d07b78
am: 18c0851a12

Change-Id: I2dead96af0552919fb06c5298a28034121afa2f0