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