Prepare for removal of junit and android.test classes from Android API (step...
Prepare for removal of junit and android.test classes from Android API (step 1) am: da676523 am: 7354231a
am: 8810281c -s ours
Change-Id: Icc280534ecd9db5e2279f2c0617f49c6ad28d075