Merge "Revert "Fix incorrect parsing of UVC interface descriptor""