Merge "defconfig: 8937_32: enable default key driver"