Merge "libutils: remove subdirs"
am: 876d9c3159

Change-Id: Ic160753c87d7172f64c0498b5a0b9f4616c5b86c