diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
index 107ec034..c9c94d12 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
+++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
@@ -17,6 +17,7 @@ PRODUCT_PACKAGES += \
 
 # Others
 PRODUCT_PACKAGES += \
+    CameraRoll \
     LocalCalendar
 
 # Browser
diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
index 107ec034..c9c94d12 100644
--- a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
+++ b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
@@ -17,6 +17,7 @@ PRODUCT_PACKAGES += \
 
 # Others
 PRODUCT_PACKAGES += \
+    CameraRoll \
     LocalCalendar
 
 # Browser
diff --git a/PrebuiltApps b/PrebuiltApps
index 9e78471d..571ea024 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 9e78471dd29f89f3453eed6063563e1efa995fbc
+Subproject commit 571ea024b15791864430510819efb3d11446668e
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
index dd6b963e..a5fb34c2 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
@@ -58,7 +58,7 @@ git apply $cvePatchesLinux/CVE-2016-6828/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-7042/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch
 git apply $cvePatchesLinux/CVE-2016-7913/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2016-7917/ANY/0001.patch
+#git apply $cvePatchesLinux/CVE-2016-7917/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-8399/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-8468/3.18/0001.patch
 git apply $cvePatchesLinux/CVE-2016-8650/ANY/0001.patch
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 84b7eb2d..a7c0b76e 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -40,7 +40,7 @@ buildAll() {
 #	brunch lineage_h815-user; - (UPSTREAM) drivers/input/touchscreen/DS5/RefCode_CustomerImplementation.c:147:1: warning: the frame size of 2064 bytes is larger than 2048 bytes
 	brunch lineage_h850-userdebug;
 	brunch lineage_hammerhead-user;
-#	brunch lineage_herolte-user; - net/netfilter/nfnetlink.c:328:14: error: 'NFNL_BATCH_FAILURE' undeclared (first use in this function)
+	brunch lineage_herolte-user;
 	brunch lineage_himaul-user;
 	brunch lineage_i9100-userdebug;
 	brunch lineage_i9305-user;
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 5a496743..bbd3327b 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -211,7 +211,6 @@ find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0
 cd $base
 
 #Fixes
-disableDexPreOpt device/lge/mako
 #Fix broken options enabled by hardenDefconfig()
 sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
 #