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

Change-Id: Ide6df9e4caade943922035b17a65bd8f73d9acd9