Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: cd7eb92ee2 am: 85e4fe1b88 am: 244906d5d0  -s ours
am: e3aad0f640  -s ours

Change-Id: Id7ada6ef33fc348e4a504ea126e4875655debd31