Merge "Fix memory leak" am: b06d384f1d am: 05480e7b92

Original change: https://android-review.googlesource.com/c/platform/test/mlts/benchmark/+/1410067

Change-Id: I9bfb77f861229601b11420f7ef164981281319db