Merge "Fix potential memory leaks" am: 486cad37 am: 07ce6d13 am: 6d4d0f1b

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



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