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

Change-Id: I0f36eb8aeb0d893c381c722afd0fa7a867dbbeee