diff --git a/sources/crystax/bin/config b/sources/crystax/bin/config
index be6f6bcc7..e8c90804c 100755
--- a/sources/crystax/bin/config
+++ b/sources/crystax/bin/config
@@ -454,6 +454,12 @@ common_cflags_for_abi()
     echo "-ffunction-sections -fdata-sections"
     echo "-fdiagnostics-show-option"
 
+    # This is to workaround GCC "(long)fn -> lfn" optimization bug.
+    # See https://android-review.googlesource.com/#/c/96345/ for details.
+    echo "-fno-builtin-rint"
+    echo "-fno-builtin-rintf"
+    echo "-fno-builtin-rintl"
+
     echo "-Wall -Wextra"
     #echo "-Wunused"
     #echo "-Wframe-larger-than=2048"
diff --git a/tests/device/crystax-issue1369-lrintf/properties.json b/tests/device/crystax-issue1369-lrintf/properties.json
deleted file mode 100644
index 1a3f596d2..000000000
--- a/tests/device/crystax-issue1369-lrintf/properties.json
+++ /dev/null
@@ -1 +0,0 @@
-{"broken": "true"}