Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev
am: 4c05d48b94

* commit '4c05d48b9492364fc7369beefa29980ee28956ee':
  stagefright: fix some issues with mkv HDR info conversions

Change-Id: I84b837adef2f89c17182d18cbb3c959126251fb2