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

Change-Id: Ibaad59f9c605f1c9ae02a4b63f7c01e6b508f55d