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

Change-Id: I4d68161e66b04863775fe245bc5f1dba5025b799