Merge "arm/dt: msm8974: Add touchscreen firmware file name" into msm-3.4