Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev