Merge "defconfig: msm: enable CONFIG_HID_NINTENDO"