Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e973546 am: 126d41f30f am: 61d3af3fe1

Change-Id: Ibf173181eede0c703c8fdfc3cfcf7d7e2c893703