Merge "[qca-nss-drv] Fix extra buffer structure in 64 bits build"