Merge "Revert "Get fastboot working on OS X""