Merge "Add MediaCodec constants for HDR10+"