Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e9735 am: 126d41f3 am: 285cfa22 Change-Id: Ic017e688b642f34d912a6f24c0d70cc0c82cbb0b