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

* commit 'b4aa177701a2ddcd3390eccc95c0e06cd9b587ef':
  Fix the Mac libbase build.