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