Merge "ext4_utils: make file system image reproducible"
am: 7bf880c2d0

Change-Id: I04bb5d246f532ee9c55dee6f746f3f220d126274