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

Change-Id: Id65101b9dccdb7ef65bbb96fa1cdef3d3ac38569