Merge "make_ext4fs: add option to specify the number of inodes"