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

* commit '1a3334f22965f531449d890c1a97811fa249a754':
  Fix Mac fastboot build.