Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e973546 am: 126d41f30f

Change-Id: Ie13b3670cdb0196bbff23a3feeebddfdcc03c740