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

Change-Id: I7596c19387a6cb09d3fac52b0fbf69f9dbf97408