Merge "mkuserimg_mke2fs.py: Package mke2fs.conf"
am: 61c47892cc

Change-Id: I94d95f31f20aee43aed60d3ce24646d44598b74d