Prepare for removal of junit and android.test classes from Android API (step 1) am: 79f2e98d97 am: da81c0d85c
am: e95d17cd9c

Change-Id: Ia1b0bc2b9d0894395383f1d84cddcf6792155c74