Merge "Don't specify sdk_version for stubs" into rvc-dev am: 0793d81b am: 1875baa9 am: 973f8b65 am: fc153e10 am: db8e5ab9 Change-Id: I62afa02a0b4be18628d1ab94e4e4f80b1583796a