Merge "Fix potential memory leaks" am: f8d240eb am: b8265b47 am: 686630da

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



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