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

Change-Id: Icf83c482e4269b37f5418a290276ffec579833cb