Merge "libcutils: route to ashmemd"
am: 5bccd33e0b

Change-Id: I757d03ad69f9d36fa145352f903825c98fc8d548