Merge "Make libutils test compile on the host" am: f5fd4888ce
am: a05a666c01

Change-Id: Iaf009f378a9b29b56297b5ba3f061bad6cec3c71