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

Change-Id: I758d793f72356e3993d3e6e2eef97a7b4b3fc238