Merge "Sync with libnativehelper refactoring"