Merge "libutils: Cleanup unused class declaration" am: 23cc38d440 am: d38831e107
am: f6c6c0cd44

Change-Id: Ief9a1314c05af5b26240e1568f79cbbdf5119cb7