Merge "Fix unaligned 16 bit access in comcerto NAND drv"