Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e9735 am: 126d41f3 am: 61d3af3f am: c79174bc Change-Id: I0f36eb8aeb0d893c381c722afd0fa7a867dbbeee