Merge "Separate android.test.mock from test-runner source"
am: d330eeeeda

Change-Id: I7d578d55332942f8e3cdc7b44dc10b31cafc4174