Merge "libcutils:  sdk(mac) build error (part deux)"