AOSP10 TWRP Merge: fix conflicts and update libraries needed

This allows flame to boot TWRP. Still will need to work on
super partition for vendor and system access.

The plan will be to cherry-pick any updates to android-9.0
through gerrit.twrp.me to this branch as a WIP.
diff --git a/gui/pages.hpp b/gui/pages.hpp
old mode 100644
new mode 100755
index 282b2d5..8c5edaf
--- a/gui/pages.hpp
+++ b/gui/pages.hpp
@@ -21,7 +21,7 @@
 #ifndef _PAGES_HEADER_HPP
 #define _PAGES_HEADER_HPP
 
-#include "../zipwrap.hpp"
+#include "zipwrap.hpp"
 #include <vector>
 #include <map>
 #include <string>