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

Change-Id: I92e048d574e3a2b638d33ceee46c979398859791