Merge "Revert "Make libutils test compile on the host""