Merge "Don't specify sdk_version for stubs" into rvc-dev am: 0793d81bae

Change-Id: Iddf8544c44a57f7dc3ef955b69eb6f7f30b4c440