Merge "Don't specify sdk_version for stubs" into rvc-dev