Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 3fe5b75a59 am: 94f59b74cc
am: 0eb672cb96

Change-Id: Ic87273351aad4174270e4faf4b25f3390011fd2e