am 248701ef: Merge "Fix the mac build."

* commit '248701ef353ec05dd78b0a1afe6be29612366b55':
  Fix the mac build.