Merge "Remove unused libnativehelper include" am: c373ce2a88

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

Change-Id: Ifcc92c99592763abccb12a4ef1d045ce79f019b0