Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp * commit '9dba1f928021450f101013e03deacc9a0506772e': Revive support for video encoding in OMXCodec.
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp * commit '9dba1f928021450f101013e03deacc9a0506772e': Revive support for video encoding in OMXCodec.