Merge "defconfig: 8930: Enable gpio-keys driver" into msm-3.0