Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d am: edefe593e3 am: 5d43c16797  -s ours
am: a0297e34dd  -s ours

Change-Id: Idd9d7ffc96e37e4d31ac0ba11a6ab819912d9f15