Merge "Separate android.test.mock classes from android.test.runner"