[automerger skipped] Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30 am: db4a0425f3 am: e47731e742 -s ours
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 a5c4682505 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: I014b4c1904efdb10ea908aba14f549be36f052d6
This commit is contained in: