Prepare for removal of junit and android.test classes from Android API (step 1) am: bb53fd26f3
am: decae51067

Change-Id: I6f771558e4712f07897ee17a842ae95bdce5627a