[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours am: 6b0056827f -s ours am: 082e791855 -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: I55d166d8eec7aeb7dcb448708f538a861a1696c9
tree: 97dd94c1b2e7c234b3f459180c2e01347f1f3cf8
  1. Tethering/