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

Change-Id: Ib163223e8f3029d421b6d687059374499346692a