am 6bcdca03: am 371e1217: (-s ours) am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"

* commit '6bcdca035d4e9f7b2aee2d3febd8e2df5f57ae6f':
  OMXCodec: enhance error handling of OMX IL client