backport cdc-acm and h264 support
fix syntax error from h264 backport