Merge "defconfig: 8974: Enable USB CCID class driver"