Merge "mkf2fsuserimg.sh: add missing features"