Merge "libstagefright: Bug Fix" am: b0bec596 am: 950482ba am: 42f45d1f...

Merge "libstagefright: Bug Fix" am: b0bec596 am: 950482ba am: 42f45d1f am: c4c78af9 am: c3f8f3e9

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



Change-Id: Ic9ab2f337417ef5cf0095b0f239459febcedc2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>