Merge "defconfig: msm8226: enable NCP6335D driver"