Merge "Fix potential memory leaks" am: 3816f5df am: 7a91734b am: 8156543c

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



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