diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index ccfc56a840..fd06694d06 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -311,6 +311,8 @@ task cleanupDuplicatesInCore() {
 	dependsOn buildOsmAndCore
 	// doesn't work for legacy debug builds
 	doLast {
+		file("libgnustl/arm64-v8a").mkdirs()
+		file("libs/arm64-v8a/libgnustl_shared.so").renameTo(file("libgnustl/arm64-v8a/libgnustl_shared.so"))
 		file("libgnustl/armeabi").mkdirs()
 		file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so"))
 		file("libgnustl/armeabi-v7a").mkdirs()
diff --git a/gradle.properties b/gradle.properties
index 7bbc19373b..1a75c657f4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,5 @@
 
 # for enableD8=true min sdk must be > 22
 # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
-# android.enableD8=false
+# UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
+ android.enableD8=false