am 06b4e982: Merge "Add missing <malloc.h> and <string.h> includes."

* commit '06b4e9826a33ddbdbddf7e74076ac29f9450414a':
  Add missing <malloc.h> and <string.h> includes.

adf/libadfhwc/adfhwc.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <poll.h>
 #include <pthread.h>
 #include <sys/resource.h>

fastbootd/commands/boot.c

@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <unistd.h>
 
 #include "boot.h"

fastbootd/commands/partitions.c

@@ -42,6 +42,7 @@
 #include <linux/hdreg.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
+#include <string.h>
 #include <cutils/config_utils.h>
 #include <inttypes.h>
 

fastbootd/commands/virtual_partitions.c

@@ -31,6 +31,7 @@
 
 #include "commands/virtual_partitions.h"
 
+#include <malloc.h>
 #include <string.h>
 
 #include "debug.h"

fastbootd/config.c

@@ -31,6 +31,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>

fastbootd/other/gptedit.c

@@ -33,6 +33,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <cutils/klog.h>

fastbootd/transport.c

@@ -19,6 +19,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 

fastbootd/utils.c

@@ -36,6 +36,7 @@
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <stdlib.h>
+#include <string.h>
 #include <cutils/properties.h>
 
 #include "utils.h"

libion/ion.c

@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/types.h>

libmemtrack/memtrack.c

@@ -21,6 +21,9 @@
 #include <log/log.h>
 
 #include <errno.h>
+#include <malloc.h>
+#include <string.h>
+
 #include <hardware/memtrack.h>
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))

libnetutils/packet.c

@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/uio.h>
 #include <sys/socket.h>

libsync/sync.c

@@ -17,6 +17,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <stdint.h>
 #include <string.h>
 

libsysutils/src/SocketClient.cpp

@@ -1,5 +1,6 @@
 #include <alloca.h>
 #include <errno.h>
+#include <malloc.h>
 #include <pthread.h>
 #include <signal.h>
 #include <string.h>

logd/LogStatistics.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <stdarg.h>
 #include <time.h>
 

logd/LogWhiteBlackList.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <ctype.h>
+#include <malloc.h>
 
 #include <utils/String8.h>
 

toolbox/ionice.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 

toolbox/lsof.c

@@ -35,6 +35,7 @@
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <pwd.h>

toolbox/renice.c

@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sched.h>

toolbox/restorecon.c

@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <selinux/selinux.h>
 #include <selinux/android.h>