Merge "Fix mac build breakage due to missing usb_osx.cpp in Android.cpp file...
Merge "Fix mac build breakage due to missing usb_osx.cpp in Android.cpp file for libfastboot2" am: a37dada0
am: 86a45d0e
Change-Id: Icd6508a398ced37298e833658dfb0a98b5772961