Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e973546 am: 8343d85129 am: e647c76f5d am: 19e620a961

Change-Id: I954795e8f55585cade02566b9bfb1b4a048887f1