Tidy up some includes.

Change-Id: I5abd4f8ab06db0c77fa369fcd97d8f1259b343df
diff --git a/dexopt/OptMain.cpp b/dexopt/OptMain.cpp
index 4460252..e59d674 100644
--- a/dexopt/OptMain.cpp
+++ b/dexopt/OptMain.cpp
@@ -38,7 +38,7 @@
 #include "Dalvik.h"
 #include "libdex/OptInvocation.h"
 
-#include "utils/Log.h"
+#include "cutils/log.h"
 #include "cutils/process_name.h"
 
 #include <fcntl.h>
diff --git a/libnativehelper/JNIHelp.cpp b/libnativehelper/JNIHelp.cpp
index 79a4042..e1ad6fc 100644
--- a/libnativehelper/JNIHelp.cpp
+++ b/libnativehelper/JNIHelp.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "JNIHelp"
 
 #include "JNIHelp.h"
-#include "utils/Log.h"
+#include "cutils/log.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libnativehelper/include/nativehelper/JNIHelp.h b/libnativehelper/include/nativehelper/JNIHelp.h
index ff9cf86..c45445c 100644
--- a/libnativehelper/include/nativehelper/JNIHelp.h
+++ b/libnativehelper/include/nativehelper/JNIHelp.h
@@ -24,7 +24,7 @@
 #define _NATIVEHELPER_JNIHELP_H
 
 #include "jni.h"
-#include "utils/Log.h"
+#include "cutils/log.h"
 #include <unistd.h>
 
 #ifndef NELEM
diff --git a/vm/Common.h b/vm/Common.h
index 01587b2..45402fe 100644
--- a/vm/Common.h
+++ b/vm/Common.h
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <assert.h>
-#include "utils/Log.h"
+#include "cutils/log.h"
 
 #if defined(HAVE_ENDIAN_H)
 # include <endian.h>
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 3705fab..9688dfe 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -223,7 +223,6 @@
 	dalvik/vm \
 	external/zlib \
 	libcore/include \
-	$(KERNEL_HEADERS)
 
 ifeq ($(dvm_simulator),true)
   LOCAL_LDLIBS += -lpthread -ldl