Merge "Remove repackaged.android.test.mock"