Merge "external/neven: use proper nativehelper headers" am: 7a1bb8b2c5 am: f03656c663 am: 1b6a90285a
am: 514be1cd56

Change-Id: I517e7754f6bf76c8e7c84066d945a747c2c9f6c2