[automerger skipped] Merge "Sync with libnativehelper refactoring" am:...

[automerger skipped] Merge "Sync with libnativehelper refactoring" am: 8ff01a1d am: 502adf62 -s ours am: 0ded2b0c -s ours

am skip reason: Change-Id Ifb5221f3d5a0dee61599ae65800c2cf2218e98ab with SHA-1 e5427eba is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1348843

Change-Id: I77fc1dc09356fac08e3bd88d5329a36c761904a8