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

Change-Id: I80e328d92646e0b2cd0fdfd3b4683cbb0178d103