diff --git a/buildkite/install-android-sdk.sh b/buildkite/install-android-sdk.sh
index 0547f8f..3e6f63e 100755
--- a/buildkite/install-android-sdk.sh
+++ b/buildkite/install-android-sdk.sh
@@ -38,13 +38,14 @@
 
 # This should be kept in sync with mac/mac-android.sh.
 tools/bin/sdkmanager \
-  "emulator" \
-  "system-images;android-23;default;x86" \
-  "platform-tools" \
   "build-tools;27.0.3" \
+  "emulator" \
+  "extras;android;m2repository" \
+  "platform-tools" \
   "platforms;android-24" \
   "platforms;android-25" \
   "platforms;android-26" \
   "platforms;android-27" \
-  "extras;android;m2repository" > /dev/null
+  "system-images;android-23;default;x86" \
+  > /dev/null
 chown -R root:root /opt/android*
diff --git a/buildkite/install-kvm.sh b/buildkite/install-kvm.sh
new file mode 100644
index 0000000..9f9958c
--- /dev/null
+++ b/buildkite/install-kvm.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Copyright 2018 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+usermod -a -G kvm buildkite-agent
diff --git a/buildkite/setup-ubuntu.sh b/buildkite/setup-ubuntu.sh
index 08ce694..1010577 100755
--- a/buildkite/setup-ubuntu.sh
+++ b/buildkite/setup-ubuntu.sh
@@ -71,7 +71,12 @@
   # Required by our infrastructure.
   lvm2
 
-  # Required by Android projects using the Skylark maven_{jar, aar} rules
+  # Required by Android projects using the Skylark maven_{jar, aar} rules.
+  # (see https://github.com/bazelbuild/continuous-integration/pull/246)
+  cpu-checker
   maven
+  qemu-system-x86
+  unzip
+  xvfb
 )
 apt-get -qqy install "${packages[@]}" > /dev/null