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

Change-Id: I15bab91af9ccfe115e8b53bbaa8ae362859726fa