libutils clean-up

Change-Id: I93a0fef582580282d62379ddba3ae2d50f3ea0c5
2 files changed