Merge "Add android.test.base/stubs dependency"