Merge "Replace legacy-android-test with android.test.base"