Merge "MediaCodec: fix possible crash at stop & error" am: e39e35ff00

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1457360

Change-Id: I8295d09e680934a191da84c648cd5a9834a2f52b