Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev
am: 1048f0fdeb

* commit '1048f0fdebadd16307dddaf0dd297e7340858218':
  stagefright: fix hdr/color metadata handling for .mkv files

Change-Id: I8a45c61a7788e2346c148e4b124d50da748a2c3a