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

Change-Id: I170ea23aba952090ecd938b517460c44a0424d6c