Merge "Build repeatable system images with mke2fs." am: 404af2ca4b
am: 300506e147

Change-Id: I0b6ad4160a081efc326e87d5c66757aa9e851781