diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py
index 6f44cb59cf2..38863970cdc 100644
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -23,8 +23,6 @@ ANDROID_PACKAGES = [
     'platform-tools',
     'build-tools-%s' % ANDROID_BUILD_TOOLS_VERSION,
     ANDROID_PLATFORM,
-    'extra-android-support',
-    'extra-google-google_play_services',
     'extra-google-m2repository',
     'extra-android-m2repository',
 ]
diff --git a/python/mozboot/mozboot/debian.py b/python/mozboot/mozboot/debian.py
index c4eec721326..d3d49f1f144 100644
--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -144,10 +144,7 @@ class DebianBootstrapper(BaseBootstrapper):
 
     def suggest_mobile_android_mozconfig(self):
         import android
-
-        # The SDK path that mozconfig wants includes platforms/android-21.
-        sdk_path = os.path.join(self.sdk_path, 'platforms', android.ANDROID_PLATFORM)
-        android.suggest_mozconfig(sdk_path=sdk_path,
+        android.suggest_mozconfig(sdk_path=self.sdk_path,
                                   ndk_path=self.ndk_path)
 
     def _update_package_manager(self):
diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index 86034d11de5..209d6cfae30 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -355,7 +355,7 @@ class OSXBootstrapper(BaseBootstrapper):
     def suggest_homebrew_mobile_android_mozconfig(self):
         import android
         # We could probably fish this path from |brew info android-sdk|.
-        sdk_path = '/usr/local/opt/android-sdk/platforms/%s' % android.ANDROID_PLATFORM
+        sdk_path = '/usr/local/opt/android-sdk'
         ndk_path = '/usr/local/opt/android-ndk'
         android.suggest_mozconfig(sdk_path=sdk_path, ndk_path=ndk_path)