Revert "DO NOT MERGE Control fault injection with config files instead of build flags"

This reverts commit f73abf36bcfd433a3fdd1664a77e8e531346c1b1.

Bug: 27724259
Change-Id: I1301fdad15650837d0b1febd0c3239134e2b94fb
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 7985fc0..9d8a217 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -34,8 +34,8 @@
 #include "applypatch.h"
 #include "mtdutils/mtdutils.h"
 #include "edify/expr.h"
-#include "ota_io.h"
 #include "print_sha1.h"
+#include "otafault/ota_io.h"
 
 static int LoadPartitionContents(const char* filename, FileContents* file);
 static ssize_t FileSink(const unsigned char* data, ssize_t len, void* token);