libcutils: Replace cutils/log.h with android/log.h
Replace references to cutils/log.h and log/log.h with android/log.h.
Point cutils/log.h to android/log.h. Adjust header order to comply
with Android Coding standards.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I4b00c0dff3a0a50cbb54301fdc5a6c29c21dab65
diff --git a/libcutils/ashmem-dev.c b/libcutils/ashmem-dev.c
index 09fa09a..db4ed11 100644
--- a/libcutils/ashmem-dev.c
+++ b/libcutils/ashmem-dev.c
@@ -23,6 +23,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <linux/ashmem.h>
#include <pthread.h>
#include <string.h>
#include <sys/ioctl.h>
@@ -30,10 +31,8 @@
#include <sys/types.h>
#include <unistd.h>
-#include <linux/ashmem.h>
-
+#include <android/log.h>
#include <cutils/ashmem.h>
-#include <log/log.h>
#define ASHMEM_DEVICE "/dev/ashmem"