Merge "Don't specify sdk_version for stubs" into rvc-dev am: 943e9735 am: 126d41f3 am: 285cfa22 am: 434aaff9 Change-Id: I7920ed117fc0a59257dea68d4ab23fd0fada7fbc