Merge "defconfig: msm: Enable CONFIG_HID_SONY for kona target"