system/core Replace log/log.h with android/log.h
Should use android/log.h instead of log/log.h as a good example
to all others. Adjust header order to comply with Android Coding
standards.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I33a8fb4e754d2dc4754d335660c450e0a67190fc
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c
index 1167d4b..2d59ad9 100644
--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -20,21 +20,19 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
+#include <linux/fs.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <unistd.h>
-#include <linux/fs.h>
-
+#include <android/log.h>
#include <cutils/config_utils.h>
-#include <log/log.h>
#include <diskconfig/diskconfig.h>
-
static int
parse_len(const char *str, uint64_t *plen)
{