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

Change-Id: I855db58666f2a2b2dda4bb9bb36d7c4df44a3903