Update openh264 wrap to v2.2.0 + fixes from master