[automerger skipped] Sync with libnativehelper refactoring am: 4b258921e0 am: 8feeb4d27b -s ours am: 5a9cf6d1f3 -s ours am: 2202663693 -s ours

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

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

Change-Id: I8408acbd79ce03b10eb2c0bf3bbafc19fd277520