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

Change-Id: Ie956b07d01af76f9d020c834078615963ed32404