Merge "libbase: quick fix for Mac build."