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

Change-Id: I446c061a297741c462d73c88e7bbc19a2333f3dd