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

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