Merge "Merge "Separate android.test.mock from test-runner source" am: d330eeeeda am: 78160c2577 am: a5e61f3249  -s ours"