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

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

Change-Id: I90a905527c9d950e675cd5708d433afc1ea7d194