Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314' * commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314': Revive support for video encoding in OMXCodec.
Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314' * commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314': Revive support for video encoding in OMXCodec.