Merge "Host users of libutils trace use libcutils." am: 4a17a712f5
am: 330c15e273

Change-Id: I3842b332694077617191cd070e3f295c29c3d98a