Merge "Revert "Fix incorrect parsing of UVC interface descriptor""
am: 8863583ffa

Change-Id: Ifb74f24bba3160b7111c5d03f1a0a646592f53ae