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

Change-Id: I939301da78c3f60c03cbe08284a4eb3e755c8fa1