Merge "Don't specify target_sdk_version" into rvc-dev