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

Change-Id: I5c2dd4a7dbab51bd373ddda66d92386b157f1232