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

Change-Id: I4a90538afecc28ec18e9057b860d1aafc00696d5