Merge "[qca-nss-clients] Modify qca-nss-clients Makefiles"