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

Change-Id: I46eb0a55595f8c736394e4ccc8cb2b0547fc89a1