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

Change-Id: Ibe6cd59c77e6a65b7d6b0d864057d0c90c6d9063