Fix potential memory leaks am: e9dc921879

Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/2321794

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