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: 49f3d944 am: 8c2d2db0 am: 49cff4d6
am: eaeb6e4c
Change-Id: I4f4ce2e70d6d22825f17b5436d89891a9fc7381f