Merge "Update libnativehelper NDK API" am: 5e00dc07a0

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1715898

Change-Id: I28a8d57f4e7ca8212b7edab568e5875cf3cfd0ed