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

Change-Id: Ie1b6e33f4e75114f65a79aeb38c34138bd62500e