diff --git a/default.xml b/default.xml
index 2be38d9..98300e7 100644
--- a/default.xml
+++ b/default.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <remote name="aosp"
+  <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com" />
-  <default revision="refs/tags/android-7.1.0_r4"
+  <default revision="refs/tags/android-7.1.0_r7"
            remote="aosp"
            sync-c="true"
            sync-j="4" />
diff --git a/remove.xml b/remove.xml
index ead8d85..8ddc949 100644
--- a/remove.xml
+++ b/remove.xml
@@ -22,6 +22,8 @@
   <remove-project name="device/google/accessory/arduino" />
   <remove-project name="device/google/accessory/demokit" />
   <remove-project name="device/google/atv" />
+  <remove-project name="device/google/marlin" />
+  <remove-project name="device/google/marlin-kernel" />
 
   <remove-project name="device/asus/fugu" />
   <remove-project name="device/asus/fugu-kernel" />