Merge "Use sdk_version: none for platform stubs" into rvc-dev am: a31590bb4a am: fa0599c645 am: 6e9398ae38

Change-Id: Ia957200635445b130906c8f2cfddaf42bf669425