Merge "input: synaptics_dsx_2.6: Propagating security fixes from msm-3.18"