pull in upstream avproxy changes