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

Change-Id: Ie9d40b1593bcd78582b8097be589d6d676915a5a