Merge "Update libnativehelper NDK API"