Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: dc8b745037 am: 8937acfca0
am: 054c5e6e85  -s ours

Change-Id: Iaaf7fb56e0f2e49f54d9b13a10a7ed2b50fde92f