Merge "system/core: use proper nativehelper headers"