Merge "Get fastboot working on OS X"