diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk
index 7c9b3286..56f72e06 100644
--- a/buildserver/provision-android-sdk
+++ b/buildserver/provision-android-sdk
@@ -71,6 +71,17 @@ y
 
 EOH
 
+mkdir -p $ANDROID_HOME/licenses/
+echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
+echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
+echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 
 chmod -R a+rX $ANDROID_HOME/
 find $ANDROID_HOME/ -type f -executable -print0 | xargs -0 chmod a+x
+
+# allow gradle to install newer build-tools versions
+chgrp vagrant $ANDROID_HOME/build-tools
+chmod g+w $ANDROID_HOME/build-tools