Merge "Keep only the classes in the android.test.mock package"