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

Change-Id: Ifb6098d9997f4f9cec945323b8f25af4ccbfa5a9