Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742
am: 872137e536

Change-Id: I5a98e76df88ad9524916b5b8757755f58df3e849