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

Change-Id: I3aaf5d756afabd572ff94059d3ffe931206211ef