Fix potential memory leaks am: 9dd926fee1

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

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