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

Change-Id: I3719f866d364c3030536dd1590a1d0e6c777eff5