Merge "Support mkv whose hevc configurationVersion is not 1" into qt-dev
am: 5d50097e73

Change-Id: I5569743148639bd170cad42a5bb81a31ae1e5387