Merge "msm_shared: Minor changes to nand driver."