update dependencies paths/names

Change-Id: Ie2d2239ec3aff92dd94acc8c1b1e0302b13e0a77
diff --git a/gui/Android.bp b/gui/Android.bp
index c66cae4..2c4a33e 100644
--- a/gui/Android.bp
+++ b/gui/Android.bp
@@ -31,7 +31,7 @@
         "bootable/recovery/crypto/scrypt/lib/util",
         "bootable/recovery/otautil/include",
         "bootable/recovery/install/include",
-        "system/core/libziparchive/include",
+        "system/libziparchive/include",
         "bootable/recovery/recovery_ui/include",
         "bootable/recovery/fuse_sideload/include",
         "bootable/recovery/gui/include",
@@ -40,7 +40,8 @@
         "bootable/recovery/libpixelflinger/include",
         "bootable/recovery/minuitwrp/include",
         "bionic",
-        "system/core/base/include",
+        "system/libbase/include",
+        "system/core/libcutils/include",
         "system/core/include",
         "external/freetype/include",
         "external/libpng"
@@ -87,4 +88,4 @@
         "libotautil",
         "libpng"
     ]
-}
\ No newline at end of file
+}