am 2b07096c: Fix Mac build

* commit '2b07096c1de5461339d9ea97869d33b5166544ae':
  Fix Mac build