Merge "defconfig: 9625: Enable gadget debug files"