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

* commit '5cd0deb85089d788736dde346e2d9887478f8d71':
  stagefright: fix some issues with mkv HDR info conversions

Change-Id: Ibdf3d555b2dbaa40777023513e616956b083af0d