Some code adjustments

native/jni/systemproperties/include/hacks.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdio.h>
+#include <syscall.h>
 
 #ifndef PR_SET_VMA
 #define PR_SET_VMA 0x53564d41
@@ -9,6 +10,5 @@
 #define PR_SET_VMA_ANON_NAME 0
 #endif
 #define getline __getline
-#define fsetxattr __fsetxattr
+#define fsetxattr(...) syscall(__NR_fsetxattr, __VA_ARGS__)
 extern "C" ssize_t __getline(char **, size_t *, FILE *);
-extern "C" int __fsetxattr(int, const char *, const void *, size_t, int);

native/jni/systemproperties/prop_area.cpp

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "system_properties/prop_area.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -41,6 +39,8 @@
 
 #include <async_safe/log.h>
 
+#include "system_properties/prop_area.h"
+
 constexpr size_t PA_SIZE = 128 * 1024;
 constexpr uint32_t PROP_AREA_MAGIC = 0x504f5250;
 constexpr uint32_t PROP_AREA_VERSION = 0xfc6ed0ab;