Revert the NDK API changes of mallinfo/mallinfo2 because they aren't yet...

Revert the NDK API changes of mallinfo/mallinfo2 because they aren't yet approved. The respective new API is still available for internal use via the porting layer.
Signed-off-by: Nsosnin-vladimir <sosninvladimir@huawei.com>

ndk_musl_include/malloc.h

@@ -18,21 +18,31 @@ void *memalign(size_t, size_t);
 
 size_t malloc_usable_size(void *);
 
-#define __MALLINFO_BODY \
-  size_t arena; \
-  size_t ordblks; \
-  size_t smblks; \
-  size_t hblks; \
-  size_t hblkhd; \
-  size_t usmblks; \
-  size_t fsmblks; \
-  size_t uordblks; \
-  size_t fordblks; \
+struct mallinfo {
+  int arena;
+  int ordblks;
+  int smblks;
+  int hblks;
+  int hblkhd;
+  int usmblks;
+  int fsmblks;
+  int uordblks;
+  int fordblks;
+  int keepcost;
+};
+
+struct mallinfo2 {
+  size_t arena;
+  size_t ordblks;
+  size_t smblks;
+  size_t hblks;
+  size_t hblkhd;
+  size_t usmblks;
+  size_t fsmblks;
+  size_t uordblks;
+  size_t fordblks;
   size_t keepcost;
-
-struct mallinfo { __MALLINFO_BODY };
-
-struct mallinfo2 { __MALLINFO_BODY };
+};
 
 #ifdef __cplusplus
 }