Merge "Fix incorrect parsing of UVC interface descriptor" am: 74458cbdf0 am: a05a067674
am: ece7d10d85

Change-Id: Iac311c26de04c9625f4ba45d729cf8f16ec6d435