diff --git a/android/build.gradle b/android/build.gradle
index b3a8bb076..d70ad12a2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
     }
 }
 
diff --git a/codebuild/cd/deploy-platform-specific-jars.sh b/codebuild/cd/deploy-platform-specific-jars.sh
old mode 100644
new mode 100755
diff --git a/codebuild/cd/deploy-snapshot-android.sh b/codebuild/cd/deploy-snapshot-android.sh
old mode 100644
new mode 100755
index 57394a680..8e44a6512
--- a/codebuild/cd/deploy-snapshot-android.sh
+++ b/codebuild/cd/deploy-snapshot-android.sh
@@ -1,8 +1,13 @@
+#!/bin/bash
+
+set -ex
+set -o pipefail # Make sure one process in pipe fail gets bubble up
+
 git submodule update --init
 cd ./android
 
 GPG_KEY=$(cat /tmp/aws-sdk-common-runtime.key.asc)
 # Publish to nexus
-./gradlew -PsigningKey=$"$GPG_KEY" -PsigningPassword=$GPG_PASSPHRASE -PsonatypeUsername='aws-sdk-common-runtime' -PsonatypePassword=$ST_PASSWORD publishToAwsNexus closeAwsNexusStagingRepository | tee /tmp/android_deploy.log
+../gradlew -PsigningKey=$"$GPG_KEY" -PsigningPassword=$GPG_PASSPHRASE -PsonatypeUsername='aws-sdk-common-runtime' -PsonatypePassword=$ST_PASSWORD publishToAwsNexus closeAwsNexusStagingRepository | tee /tmp/android_deploy.log
 # Get the staging repository id and save it
-cat /tmp/android_deploy.log | grep "Created staging repository" | cut -d\' -f2 | tee /tmp/android_repositoryId.txt
\ No newline at end of file
+cat /tmp/android_deploy.log | grep "Created staging repository" | cut -d\' -f2 | tee /tmp/android_repositoryId.txt
diff --git a/codebuild/cd/deploy-snapshot.yml b/codebuild/cd/deploy-snapshot.yml
index 03982831c..5082941ca 100644
--- a/codebuild/cd/deploy-snapshot.yml
+++ b/codebuild/cd/deploy-snapshot.yml
@@ -61,7 +61,7 @@ phases:
       - bash ./codebuild/cd/deploy-platform-specific-jars.sh
       - mvn nexus-staging:close -Prelease -DstagingRepositoryId=$STAGING_REPO_ID
       # deploy android
-      - bash ./codebuild/cd/deploy-snapshot-android.sh
+      - ./codebuild/cd/deploy-snapshot-android.sh
   post_build:
     commands: