Prepare for removal of junit and android.test classes from Android API (step 1) am: da676523 am: 7354231a am: 8810281c -s ours am: 3eed661b -s ours Change-Id: I00919a463487a6cf195a82d9cca98d7a4453a531