xrdp-ng: remove avro and merge xup with xrdp-ng