Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp