Merge "libutils/libcutils: make host more like device"