Merge "libutils/libcutils: make host more like device" am: 43f29072a9
am: 02bb6c1b24

Change-Id: Ia7a1579ba589a8d68379ba9adfb5b69ebc1ed868