Merge "Don't specify sdk_version for stubs" into rvc-dev am: 0793d81b am: 1875baa9 am: 973f8b65 Change-Id: I3f9757f7bdb94b1166533e318b17cc27bcde1ced