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

Change-Id: I650a7c5bf614e30c2fe599891824d903695f5662