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

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

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