Merge "mke2fs, libext2fs: make filesystem image reproducible" am: a9ed04d389
am: e835a5097d

Change-Id: I2d0161b6bef8b292b742ee0a8fab08d39f7298ae