Merge "adb: pin USB interface versions on darwin."
am: 6a08b2c255

Change-Id: Iac9b92f734624ba4163eece7469b998f108df9b4