Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 3fe5b75a59
am: 94f59b74cc

Change-Id: Ib2be054393b06bb5a4b99818da3d3891d761e7dc