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

Change-Id: Ib61a8d65ba747b0dbe53c9f9b986b701fd630df9