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

Change-Id: I70320f6be74649ac69c7148f6440faead5e4d6e1