Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e9735 am: 8343d851 am: e647c76f am: 19e620a9 Change-Id: I954795e8f55585cade02566b9bfb1b4a048887f1