resolve merge conflicts of b7d5a47cec to master.
Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d
diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 8bf03cb..1f92e57 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -46,9 +46,9 @@
#include <cutils/log.h>
#include <cutils/klog.h>
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
using android::base::StringPrintf;