Merge "libcutils: sdk(mac) build error"