Merge "Added android.test.mock and android.test.mock.sdk targets"