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

Change-Id: Ie9de4bc9158245ea57dbc93a20236720d5c650ec