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

Change-Id: Icafeec34a88de1e0a25c61e02042d9fd0be2b21d