diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk
index e998d96c22..2adf8dd8d3 100755
--- a/OsmAnd/jni/Android.mk
+++ b/OsmAnd/jni/Android.mk
@@ -2,19 +2,16 @@ LOCAL_PATH := $(call my-dir)
 ROOT_PATH := $(LOCAL_PATH)/../../..
 $(info OsmAnd root: $(ROOT_PATH))
 
-# LEGACY {
 ifdef BUILD_ONLY_OLD_LIB
 OSMAND_MAKEFILES := \
     $(all-subdir-makefiles) \
     $(call all-makefiles-under,$(ROOT_PATH)/core-legacy/targets/android)
 else 
-# } LEGACY
 OSMAND_MAKEFILES := \
     $(all-subdir-makefiles) \
 	$(call all-makefiles-under,$(ROOT_PATH)/core/wrappers/android)
-# LEGACY {
 endif
-# } LEGACY
+
 $(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
 
 # By default, include makefiles only once
diff --git a/gradle.properties b/gradle.properties
index f333e09e7e..7bbc19373b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Fri Apr 08 18:47:31 EEST 2016
-android.useDeprecatedNdk=true
+# android.useDeprecatedNdk=true
 
 # 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