Merge "Update libnativehelper NDK API" into sc-dev