Merge "Fix potential memory leaks" am: 3816f5df52

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

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