--- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -1,30 +1,23 @@
 [
   {
-    "versions": [
-      "Android SDK 6.0 / API 23",
-      "Android tools r24.4",
-      "Android build tools 23.0.3",
-      "Android Support Repository (Support Library 23.0.1)",
-      "Google Support Repository (Google Play Services 8.1.0)"
-    ],
-    "size": 573952124,
+    "size": 735632692,
     "visibility": "internal",
-    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c",
     "algorithm": "sha512",
     "filename": "android-sdk-linux.tar.xz",
     "unpack": true
   },
   {
-    "size": 30899096,
-    "visibility": "public",
-    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "size": 37130176,
+    "visibility": "internal",
+    "digest": "254eecc06eea407c098417c1dbedf89f59883cdde7e173b0473fa5b34719c967830afa11189c3a9f69dc3f3b9e5fb43469434340e1f8feb378609af965783b48",
     "algorithm": "sha512",
-    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "filename": "java_home.tar.xz",
     "unpack": true
   },
   {
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "jcentral.tar.xz",
     "unpack": true,
     "digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",

--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -4,26 +4,19 @@
     "size": 299040511,
     "visibility": "internal",
     "digest": "0f9ba6efbc5379225ebe13b956b9f19d055654f9b0ae999b1eb18ca836e1665be820bcc05193ba24c9a328a1bfea63fe814c1f364b28ae29266effaa04eedbee",
     "algorithm": "sha512",
     "filename": "android-ndk.tar.bz2",
     "unpack": true
   },
   {
-    "versions": [
-      "Android SDK 6.0 / API 23",
-      "Android tools r24.4",
-      "Android build tools 23.0.3",
-      "Android Support Repository (Support Library 23.0.1)",
-      "Google Support Repository (Google Play Services 8.1.0)"
-    ],
-    "size": 573952124,
+    "size": 735632692,
     "visibility": "internal",
-    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c",
     "algorithm": "sha512",
     "filename": "android-sdk-linux.tar.xz",
     "unpack": true
   },
   {
     "size": 4906080,
     "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
     "algorithm": "sha512",
@@ -50,16 +43,16 @@
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "gradle-dist.tar.xz",
     "unpack": true,
     "digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
     "size": 51753660
   },
   {
-    "size": 30899096,
-    "visibility": "public",
-    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "size": 37130176,
+    "visibility": "internal",
+    "digest": "254eecc06eea407c098417c1dbedf89f59883cdde7e173b0473fa5b34719c967830afa11189c3a9f69dc3f3b9e5fb43469434340e1f8feb378609af965783b48",
     "algorithm": "sha512",
-    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "filename": "java_home.tar.xz",
     "unpack": true
   }
 ]

--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -4,44 +4,37 @@
     "size": 299040511,
     "visibility": "internal",
     "digest": "0f9ba6efbc5379225ebe13b956b9f19d055654f9b0ae999b1eb18ca836e1665be820bcc05193ba24c9a328a1bfea63fe814c1f364b28ae29266effaa04eedbee",
     "algorithm": "sha512",
     "filename": "android-ndk.tar.bz2",
     "unpack": true
   },
   {
-    "versions": [
-      "Android SDK 6.0 / API 23",
-      "Android tools r24.4",
-      "Android build tools 23.0.3",
-      "Android Support Repository (Support Library 23.0.1)",
-      "Google Support Repository (Google Play Services 8.1.0)"
-    ],
-    "size": 573952124,
+    "size": 735632692,
     "visibility": "internal",
-    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "digest": "dc4329803b4f941d52d61a32c054e209890c2dd793ac2cbbeadb15e4bd23104f7ba99c113472326c7751dbe99e00238208432a05183d9a01bed13f38297b3b3c",
     "algorithm": "sha512",
     "filename": "android-sdk-linux.tar.xz",
     "unpack": true
   },
   {
     "size": 4906080,
     "visibility": "public",
     "unpack": true,
     "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
     "algorithm": "sha512",
     "filename": "jsshell.tar.xz"
   },
   {
-    "size": 30899096,
-    "visibility": "public",
-    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "size": 37130176,
+    "visibility": "internal",
+    "digest": "254eecc06eea407c098417c1dbedf89f59883cdde7e173b0473fa5b34719c967830afa11189c3a9f69dc3f3b9e5fb43469434340e1f8feb378609af965783b48",
     "algorithm": "sha512",
-    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "filename": "java_home.tar.xz",
     "unpack": true
   },
   {
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "jcentral.tar.xz",
     "unpack": true,
     "digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",