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

Change-Id: Ic41cc11458f9ae17815a9c35f57fd2d25c368e78