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