Merge "[qca-nss-ecm] Modify ipq60xx to ipq6018"