Merge "Use sdk_version: none for platform stubs" am: ad2433ffcd am: b85c57cd47

Change-Id: Ie92c5e97901a103d09aed63781254bbc4337ec61