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

Change-Id: I6462b74ccbdeaeffc50b3051d5d64f55fb1253cd