am 660b7ad3: am 2637cb17: Merge "Allow OMXCodec to specify an output color...
am 660b7ad3: am 2637cb17: Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
* commit '660b7ad3':
Allow OMXCodec to specify an output color format for OMX decoder component