Merge "Always use MKE2FS to build ext4 image"
am: dee5abd85a

Change-Id: I2739bb6a533fd5161e0ab11382245e0791e29e09