Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
am: 3fc616a742

Change-Id: Ib4ed27bf723799aede7d198939c5e22def4af5a5