Merge "Fix Mac fastboot build."