Merge "Separate android.test.mock from test-runner source"