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