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

Change-Id: I930f75fb95ef705566f97af45bd33fa9835a6bb5