Merge "defconfig: 8974: Enable GPIO keys driver" into msm-3.4