[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I812dfa946299dc565e915dcbabe43e1d74abeb1f
This commit is contained in: