Merge "Remove target_sdk_version parameter" into nyc-dev