Merge "Handle cases where exceptions may be thrown." am: a0d573ecd4

Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2430694

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