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

Change-Id: I98ac760c7d6d50e495f7f697901b842c8f4186d2