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

Change-Id: I018c34a0e70e448dc96805ba759921fa0a080c2f