Merge "defconfig: msm8610: enable Goodix touchscreen driver"