Merge "Remove unnecessary dependency on libnativehelper.so" am: 82a8c40f72

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1594053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b014124a3668d7a62b122c809816202643044c