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

Change-Id: I52c94e45a2238cac824c569e525a43c81356fc7c