am 4f8edb3c: am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."

* commit '4f8edb3c27f64bd07295353cdf018aa1cf41718b':
  Fix the Mac libcutils build.