Merge "libutils: Cleanup unused class declaration"