Merge change I9a50fdf4 into eclair-mr2

* changes:
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.