am 209d4528: am 0a58ece3: Merge "Fix Mac build."

* commit '209d452845cb371854a940455e60496b029ac422':
  Fix Mac build.