Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp