Merge "libutils: remove subdirs" am: 876d9c3159
am: f664fbd336

Change-Id: I9d567371c77d436acec1e7335f8d6ffaf01a2e3f