Merge "defconfig: 9625: Enable NAND driver, MTD and YAFFS2 configs" into msm-3.4