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

Change-Id: I59469c63aa011c68dbc1623b8f0b581a07d55e47