Merge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96
am: 9db54ab7b3

Change-Id: Iceb76b0636157932347bb52de827f398e21f2766