Merge "libbase: quick fix for Mac build." am: 602f9a29b0
am: 4aecbd0aac

Change-Id: I9d28592383bab531bb5634a10c6c15a0b1dade45