libutils clean-up

Change-Id: I3bf32d72aa8eec627249a675c130c91a8aff6710
4 files changed