[automerger skipped] Sync with libnativehelper refactoring am: 4b258921 am:...

[automerger skipped] Sync with libnativehelper refactoring am: 4b258921 am: 8feeb4d2 -s ours am: 5a9cf6d1 -s ours am: 22026636 -s ours

am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 37cb33e4 is in history

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

Change-Id: I8408acbd79ce03b10eb2c0bf3bbafc19fd277520