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

* commit '099ec31bdb910020c5c86b4ad8711940616bcbaf':
  Fix the Mac libcutils build.