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

Change-Id: I91bcd37ef04a8f8e7258fea72fcb516f8c0be386