Merge "libcutils: sdk(mac) build error" am: 231d1ac640 am: 7bc8810a4a
am: 190e9cc65d

Change-Id: I701734f8f88593e603ca7539548240ba0760b864