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

Change-Id: I3ae1d2cea8ba841e3da18346238bafa69a2dd3cb