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

Change-Id: Ic1774c16d28466542543f4b43deaaca3b80755e6