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

Change-Id: Id1dc638c481adb5f8f4490d8ac4f41afbd767720