Merge "stagefright: fix some issues with mkv HDR info conversions" into...
Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev am: 4c05d48b am: 5cd0deb8
am: 6ae82450
* commit '6ae82450':
stagefright: fix some issues with mkv HDR info conversions
Change-Id: I80e1cd82e5c3075bf7b05f02bf79a8e38d86283c