Update to xBRZ 1.1.

Keeping the channel swap stuff and other changes, though.
Merge pull request #7045 from unknownbrackets/xbrz-update

Update to xBRZ 1.1