tools/mtd-utils: add two upstream patches