Merge "Revert "Make libutils test compile on the host"" am: 16f4fb9c4e
am: 5682e001e9

Change-Id: I3b01c3f65e7b05191b3867928a5e9d1b8f8cc1c8