diff --git a/android/build.gradle b/android/build.gradle
index da8455a..f058512 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,8 @@
 
 def pEpEngineSrc = hasProperty('pEpEngineSrc') ? pEpEngineSrc : "../../pEpEngine"
 def buildAutomatic = hasProperty('buildAutomatic') ? buildAutomatic : "true"
-def threadsToUse = hasProperty('threadsToUse') ? threadsToUse : 1
+def threadsToUse = hasProperty('threadsToUse') ?
+        threadsToUse : Runtime.getRuntime().availableProcessors()
 
 def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
 
@@ -77,7 +78,7 @@ android {
             jniDebuggable true
             externalNativeBuild {
                 ndkBuild {
-                    arguments "-j${threadsToUse}", 'NDK_LOG=1'
+                    arguments "-j${threadsToUse}", 'NDK_LOG=1', 'NDK_DEBUG=1', 'NDEBUG=null'
                    // arguments '-B', 'NDK_DEBUG=1', 'NDEBUG=null', 'NDK_LOG=1'
                 }
             }
diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf
index 60890e5..561134d 100644
--- a/android/external/Makefile.conf
+++ b/android/external/Makefile.conf
@@ -20,7 +20,7 @@ NETTLE_VERSION=3.4.1
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD
-EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?b5b783f58c9b6fdb26163cb7b236ee71cfef339e
+EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?de497f59570437d448b293769eb57bf7a9741f30
 
 ### Common variables
 #### Source code targets