Merge "libutils: remove subdirs"