Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 4736a94d am: b14c4625

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379

Change-Id: Ib08745da0730969220db6ed83fa98c02e029f6e4