am 737b06fe: am 4150611d: Merge "Fix mac build."

* commit '737b06fed84ee1cedc6f2b60a6eaac32ff9782d2':
  Fix mac build.