Merge "Remove mkuserimg.sh from otatools"