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

Change-Id: I27ade6c724a593f120e599c4afa185faee0e58dd