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

Change-Id: I9cf742acbfeda8755f8b0c41be0088617d3d3025