Merge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0 am: d57a607ac7
am: 4814dc5fa7

Change-Id: I8459f1a3dbdc2bbb84a86f4376d3e2c59239862a