Merge "MediaCodec: fix crash when stop-error-death"