[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -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: Ief614f159c1972c181986ae05b01b5dc2a92b1ee
tree: 41e2da029ca5fdd40af7be2cbd77948cc56751c8
  1. Tethering/