Merge "libcutils:  sdk(mac) build error (part deux)" am: ed0a48c617 am: 5a411029de am: 01f8f8c586
am: c43b02f2cb

Change-Id: Idea08d579dd3d1bfbd98d6cbe2e67781e731db3a