Merge "Set min_sdk_version (for non-mainline files)" into rvc-dev