Merge "libcutils: route to ashmemd"