Merge "qca-wifi: Fix compilation errors when ADFS macro is disabled"