Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp
am: 28f867d780
-s ours
Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
main
commit
fc91fc0582