Merge "[TetheringGoogle] Remove explicit targetSdkVersion"