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

Change-Id: I6857786fde370caf9c7ea10202e90b8e945d6627