Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 75df705a0f am: c3feb4707c am: a8d3b40245
am: b00d8d3140  -s ours

Change-Id: I7a91e34e9a7b3cec89bf7994ac851e4ed522a8d6