Revert "Move error_code.h into otautil."

This reverts commit 623fe7e701d5d0fb17082d1ced14498af1b44e5b.

Reason for revert: Need to address device-specific modules.

Change-Id: Ib7a4191e7f193dfff49b02d3de76dda856800251
diff --git a/edify/Android.mk b/edify/Android.mk
index db7b5b6..cec65f4 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -30,8 +30,7 @@
 LOCAL_CPPFLAGS := -Wno-unused-parameter
 LOCAL_CPPFLAGS += -Wno-deprecated-register
 LOCAL_MODULE := libedify
-LOCAL_STATIC_LIBRARIES += \
-    libotautil \
-    libbase
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
+LOCAL_STATIC_LIBRARIES += libbase
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/edify/expr.h b/edify/expr.h
index f2a4d6d..4838d20 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "otautil/error_code.h"
+#include "error_code.h"
 
 struct State {
     State(const std::string& script, void* cookie);