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

* commit 'ff2016599ddaab326ff94c9f1680ac641bb0055e':
  Fix the Mac libcutils build.