Merge "MediaCodec: handle a spontaneous error while configuring" into mnc-dev