Merge "Remove the mkuserimg_mke2fs.sh" am: a88a7d23c0
am: 6906f8977a

Change-Id: I63b321b06dc3ced7650e15a9d44007d47d91f3b7