Snap for 4772880 from 867cc009c377cb96cfd2b420066fa07e868ec7a3 to studio-3.2-release

Change-Id: If017940a8bdf7a7e8c6309dc4383a6a70a53cf6c
diff --git a/libdex/DexFile.h b/libdex/DexFile.h
index a12f025..b3dcca1 100644
--- a/libdex/DexFile.h
+++ b/libdex/DexFile.h
@@ -36,12 +36,12 @@
 #ifndef LOG_TAG
 # define LOG_TAG "libdex"
 #endif
+#include <log/log.h>
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <assert.h>
-#include "cutils/log.h"
 
 /*
  * If "very verbose" logging is enabled, make it equivalent to ALOGV.