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

* commit '68054cab554790b5db18820d9744e06059b89cee':
  Fix the Mac libbase build.