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

Change-Id: I88c802988fc17afcc7274be12940295e0987e341