Merge "stagefright: fix stop-error-release crash" am: 0d45784c am: e6e1a8be am: bdeb21c7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ed026e1ed4181893c4b94bbdc9130c3d89b5da4