Merge "ipq6018: Enabling SPI NAND support for Emulation"