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

Change-Id: I931f22eecf9185783c5f5be1c9c0f551998e6e2f