Merge "Use sdk_version: none for platform stubs"