am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build."

* commit '4d2b0716c539fd07fd836197655b4768c4bfc3d5':
  Fix Mac fastboot build.