Merge "ext4_utils: make file system image reproducible" into oc-mr1-dev
am: 9784ce307f

Change-Id: Icf59233cfc3a6e399894ab92855a8d764e0fb772