Merge "Remove android.test.mock classes from android.jar"