Merge "defconfig: msm8610: Enable ft5x06 touch driver"