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

Change-Id: I9d455abb345da178714f889608e221ee3440b945