Merge "external/neven: use proper nativehelper headers"
am: 7a1bb8b2c5

Change-Id: I5e8ff0f532e164d3cfc4be5c87739396ea871aa1