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

Change-Id: Ie03ef29d5897764f06f3054687424f890d9a6733