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

Change-Id: If09ce3e9a5da7a357b883f119bbf2d0ed2385ade