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

Change-Id: Ic5b500f5c0a7c622981a64a2e9e6f4f6e0960a6f