Prepare for removal of junit and android.test classes from Android API (step 1) am: 49f3d944cf am: 8c2d2db0e3
am: 49cff4d6d9

Change-Id: Ief63a0d2759860129bc140bad1e55d878f4b1240