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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa9110425fcc7363cb468b33623e0d22463a78ae