Merge "Fix mac build breakage due to missing usb_osx.cpp in Android.cpp file for libfastboot2"