Merge "Don't specify sdk_version for stubs" into rvc-dev am: ae47be49 am: aa76397c am: 3548d701 am: 214c7155 am: 3f87f7c9 Change-Id: I5f71af9acabc10c1d60c2312dc33a9a54283a740