Merge "Remove unused libnativehelper include" am: c373ce2a88 am: 74685e1ecd

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1354335

Change-Id: I779cae1f133b3364c383687cdabde70c6ab088ee