Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e9735 am: 126d41f3 am: 61d3af3f am: c79174bc am: aa723560 Change-Id: I58936887fa8c894a3059eee63c31fb2062e653fb