Merge "Drop dependency of android.test.mock -> android.test.base."