Fix potential memory leaks am: 9dd926fee1 am: 76452f6970

Original change: https://android-review.googlesource.com/c/platform/art/+/2313101

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