Merge change Ib482ce88 into eclair-mr2

* changes:
  Revive support for video encoding in OMXCodec.