Merge "make ext4 utils callable from C++" into ics-aah