Merge "Fix the mac fastboot build"