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

Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f