Merge "external/neven: use proper nativehelper headers"