Merge "make_ext4fs: use libcutils and libselinux shared libraries"