diff --git a/Patches/LineageOS-17.1/android_bionic/0002-Symbol_Ordering.patch b/Patches/LineageOS-17.1/android_bionic/0002-Symbol_Ordering.patch
new file mode 100644
index 00000000..4e25b3f1
--- /dev/null
+++ b/Patches/LineageOS-17.1/android_bionic/0002-Symbol_Ordering.patch
@@ -0,0 +1,22 @@
+From ede5e38f5b11f362c393e35911d5440db27c402a Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sat, 7 Sep 2019 19:27:52 -0400
+Subject: [PATCH] disable symbol ordering for now
+
+---
+ libc/Android.bp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/Android.bp b/libc/Android.bp
+index 7c3f57fba..5352f39cb 100644
+--- a/libc/Android.bp
++++ b/libc/Android.bp
+@@ -1645,7 +1645,7 @@ cc_library {
+         versions: ["10000"],
+     },
+ 
+-    symbol_ordering_file: "symbol_ordering",
++    //symbol_ordering_file: "symbol_ordering",
+ }
+ 
+ genrule {
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 96aebe02..aefb2f53 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -56,13 +56,13 @@ buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
 	#SDS4P
-	buildDevice mako;
+	buildDevice mako; #xxx: wifi no connect
 	#SD600
 	buildDevice jfltexx;
 	#SD800
 	buildDevice d802;
 	#SD801
-	buildDevice d852;
+	buildDevice d852; #XXX: no boot. partitions?
 	buildDevice d855;
 	buildDevice FP2;
 	buildDevice m8;
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 3ef69034..b5d62859 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -59,6 +59,7 @@ cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/
 
 enterAndClear "bionic";
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
+if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0002-Symbol_Ordering.patch"; fi; #(GrapheneOS)
 
 enterAndClear "bootable/recovery";
 #git revert --no-edit 4d361ff13b5bd61d5a6a5e95063b24b8a37a24ab; #Always enforcing #XXX 17REBASE
@@ -198,11 +199,18 @@ enterAndClear "device/google/marlin";
 git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs
 
 enterAndClear "device/lge/g2-common";
-sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
+#sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
 
 enterAndClear "device/lge/g3-common";
-sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
-sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te;
+echo "vendor/lib/hw/nfc_nci.msm8974.so|7dcb79a385dd1155cb9b6310a3e7b85b7dc8db13" >> proprietary-files.txt; #g3-common: Add NFC HAL to proprietary-files (254249)
+#sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
+#sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te;
+
+enterAndClear "device/lge/d852";
+git revert --no-edit dbebbce20b2b303fe13f7078ef54154f9dd5d9e2; #fix nfc path
+
+enterAndClear "device/lge/d855";
+git revert --no-edit 9a5739e66d0a44347881807c0cc44d7c318c02b8; #fix nfc path
 
 enterAndClear "device/lge/mako";
 #git revert ; #restore releasetools #TODO