am 782daf89: Merge "Fix the Mac libbase build."

* commit '782daf892d5f68e51200a4da48e9ab1bc1dedd23':
  Fix the Mac libbase build.