Merge "Fix the Mac libbase build."