Merge "cpp: use proper nativehelper headers"