Merge change 22921 into eclair

* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read