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

Change-Id: I502b9ca53e8bb988ed4b3bf253c5c4259abb5fa2