Merge "ext4_utils: use android_filesystem_capability.h"