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

Change-Id: Id65a1e56409db02d853923818f4671a4ddfd1007