diff --git a/java/build-android.gradle b/java/build-android.gradle
index 1d1d874db6..bfbb6f4596 100644
--- a/java/build-android.gradle
+++ b/java/build-android.gradle
@@ -32,7 +32,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:3.5.3'
+		classpath 'com.android.tools.build:gradle:4.0.1'
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/java/src/test/android/build.gradle b/java/src/test/android/build.gradle
index 0f448b3f1e..daa964ea22 100644
--- a/java/src/test/android/build.gradle
+++ b/java/src/test/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:3.5.3"
+		classpath "com.android.tools.build:gradle:4.0.1"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index b44902f7c1..f6236f7a45 100644
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -1170,6 +1170,7 @@ def build_targets(args, cmake_path, build_dir, configs, num_parallel_jobs, targe
         env = {}
         if args.android:
             env['ANDROID_SDK_ROOT'] = args.android_sdk_path
+            env['ANDROID_NDK_HOME'] = args.android_ndk_path
 
         run_subprocess(cmd_args, env=env)