Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: f2d90cc8d8

Change-Id: I1cb7c5aeb0c3efaf5477df9ef8c08fad425742e9