diff --git a/.github/workflows/android-sample.yml b/.github/workflows/android-sample.yml
index b640481af..1dff6051d 100644
--- a/.github/workflows/android-sample.yml
+++ b/.github/workflows/android-sample.yml
@@ -13,6 +13,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Install NDK 20
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Build with Gradle
       run: ./gradlew :sample:assembleDebug
     - name: upload artifact
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d9288001d..20fe8cbc9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -15,6 +15,8 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Install NDK 20
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Build with Gradle
       run: ./gradlew :sample:assembleDebug :sample:assembleRelease
     - name: Rename apk
diff --git a/android/build.gradle b/android/build.gradle
index 6972c0aa1..9af5922fb 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -11,6 +11,7 @@ apply plugin: 'maven'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
     // Uncomment this and enable the database plugin test when roboelectric is upgraded
     // testOptions.unitTests.includeAndroidResources = true
 
diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index a7d231416..c8be2366e 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
     defaultConfig {
         minSdkVersion 21
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/android/third-party/overrides/DoubleConversion/build.gradle b/android/third-party/overrides/DoubleConversion/build.gradle
index 06389eb64..e5c953595 100644
--- a/android/third-party/overrides/DoubleConversion/build.gradle
+++ b/android/third-party/overrides/DoubleConversion/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/android/third-party/overrides/Folly/build.gradle b/android/third-party/overrides/Folly/build.gradle
index 7fdd6991d..ba2da1a8d 100644
--- a/android/third-party/overrides/Folly/build.gradle
+++ b/android/third-party/overrides/Folly/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/android/third-party/overrides/LibEvent/build.gradle b/android/third-party/overrides/LibEvent/build.gradle
index 3cc6bc75a..ae5020706 100644
--- a/android/third-party/overrides/LibEvent/build.gradle
+++ b/android/third-party/overrides/LibEvent/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/android/third-party/overrides/OpenSSL/build.gradle b/android/third-party/overrides/OpenSSL/build.gradle
index 2998c65ce..e5dc2e3fd 100644
--- a/android/third-party/overrides/OpenSSL/build.gradle
+++ b/android/third-party/overrides/OpenSSL/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/android/third-party/overrides/RSocket/build.gradle b/android/third-party/overrides/RSocket/build.gradle
index 5c56b5572..f7c89a793 100644
--- a/android/third-party/overrides/RSocket/build.gradle
+++ b/android/third-party/overrides/RSocket/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/build.gradle b/build.gradle
index ab8408e09..5f2d418b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
     }
 }
@@ -44,6 +44,7 @@ ext {
     targetSdkVersion = 29
     compileSdkVersion = 29
     buildToolsVersion = '29.0.2'
+    ndkVersion = '20.0.5594570'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
diff --git a/xplat/build.gradle b/xplat/build.gradle
index 075332ac1..9abb99ef1 100644
--- a/xplat/build.gradle
+++ b/xplat/build.gradle
@@ -10,6 +10,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion