Merge "Revert "Get fastboot working on OS X""
am: c8cad2cbfc

Change-Id: I75a48102a1f06b215d5522f2a5c4f7b09322ef64