am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2

Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314'

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