Merge "Fix the mac fastboot build"
am: 640ceee567

Change-Id: Id41b2b39fbf5b721f0f80017715daf34ac40dd87