am f5fee046: am 9a922554: Merge "MediaCodec: handle a spontaneous error while...
am f5fee046: am 9a922554: Merge "MediaCodec: handle a spontaneous error while configuring" into mnc-dev
* commit 'f5fee046':
MediaCodec: handle a spontaneous error while configuring