Why not track upstream more closely? It seems the next update is going
to be painful thanks to C++ damage, libusb support being dropped and
other breakage mixed in.
- Update to m.p.122 (Android M Preview, 122 commits ahead)
- Copy & Cleanup usb_libusb.c (struct/const/static, headers, BSDisms, whitespace)
https://android.googlesource.com/platform/system/core/+log/53d504f/adb
http://www.androidpolice.com/2015/06/15/android-m-feature-spotlight-adb-can-now-reboot-directly-to-sideload-mode-adds-a-few-other-commands/