Merge "com.android.server: use proper nativehelper headers"