Merge "Don't specify sdk_version for stubs" into rvc-dev am: ae47be49 am: aa76397c am: 3548d701 Change-Id: Icf83c482e4269b37f5418a290276ffec579833cb