Merge "mkf2fsuserimg.sh: add missing features" am: ee26162805
am: a8ad2688ac

Change-Id: I07733c0b5bc260f3abaed6e438c1c9b9d5d7fa98