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

Change-Id: Iffc5fbc102efb9e4a427b5c06595baa51b9a6394