Merge "defconfig: 8064: Enable GPIO based matrix keypad driver" into msm-3.0