Merge "Remove dependencies on libutils."