android hikey-v2: update to use fastboot provided by google

the platform-tools version used here is r26.0.0 from following link:
https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip

fastboot --version
fastboot version 3db08f2c6889-android
Installed as /lava-188844/0/tests/0_install-google-fastboot/platform-tools/fastboot

Info from https://developer.android.com/studio/releases/platform-tools.html
26.0.0 (June 2017)
Updated with the release of Android O final SDK (API level 26)

Change-Id: I38a8a58a59d6be9d32186a4647c9ae5960dcb002
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

37 files changed, 925 insertions, 78 deletions

diff --git a/android/hikey-v2/template-andebenchpro2015.yaml b/android/hikey-v2/template-andebenchpro2015.yaml
index 2a1eea1..5cd18b3 100644
--- a/android/hikey-v2/template-andebenchpro2015.yaml
+++ b/android/hikey-v2/template-andebenchpro2015.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-antutu6.yaml b/android/hikey-v2/template-antutu6.yaml
index 91e7d46..ea31667 100644
--- a/android/hikey-v2/template-antutu6.yaml
+++ b/android/hikey-v2/template-antutu6.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-benchmarkpi.yaml b/android/hikey-v2/template-benchmarkpi.yaml
index 2f3b984..215e707 100644
--- a/android/hikey-v2/template-benchmarkpi.yaml
+++ b/android/hikey-v2/template-benchmarkpi.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-boottime.yaml b/android/hikey-v2/template-boottime.yaml
index b620c88..4fbd109 100644
--- a/android/hikey-v2/template-boottime.yaml
+++ b/android/hikey-v2/template-boottime.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,11 +31,11 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
-
 - boot:
     namespace: tlxc
     prompts:
@@ -44,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-caffeinemark.yaml b/android/hikey-v2/template-caffeinemark.yaml
index 829b449..4ea9c01 100644
--- a/android/hikey-v2/template-caffeinemark.yaml
+++ b/android/hikey-v2/template-caffeinemark.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cf-bench.yaml b/android/hikey-v2/template-cf-bench.yaml
index 5155d37..9db376b 100644
--- a/android/hikey-v2/template-cf-bench.yaml
+++ b/android/hikey-v2/template-cf-bench.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-focused1-v7a.yaml b/android/hikey-v2/template-cts-focused1-v7a.yaml
index 6dcd44e..75d9691 100644
--- a/android/hikey-v2/template-cts-focused1-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-focused1-v8a.yaml b/android/hikey-v2/template-cts-focused1-v8a.yaml
index 6ba1835..9f07dec 100644
--- a/android/hikey-v2/template-cts-focused1-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-focused2-v7a.yaml b/android/hikey-v2/template-cts-focused2-v7a.yaml
index e593555..bda8b51 100644
--- a/android/hikey-v2/template-cts-focused2-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-focused2-v8a.yaml b/android/hikey-v2/template-cts-focused2-v8a.yaml
index 73e104d..da7710a 100644
--- a/android/hikey-v2/template-cts-focused2-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-media-v7a.yaml b/android/hikey-v2/template-cts-media-v7a.yaml
index 01dc541..f7aaf80 100644
--- a/android/hikey-v2/template-cts-media-v7a.yaml
+++ b/android/hikey-v2/template-cts-media-v7a.yaml
@@ -16,6 +16,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -32,8 +33,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -45,6 +47,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-media-v8a.yaml b/android/hikey-v2/template-cts-media-v8a.yaml
index 5715ed7..74f7c4f 100644
--- a/android/hikey-v2/template-cts-media-v8a.yaml
+++ b/android/hikey-v2/template-cts-media-v8a.yaml
@@ -16,6 +16,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -32,8 +33,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -45,6 +47,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-opengl-v7a.yaml b/android/hikey-v2/template-cts-opengl-v7a.yaml
index b5dbc78..76c5069 100644
--- a/android/hikey-v2/template-cts-opengl-v7a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-opengl-v8a.yaml b/android/hikey-v2/template-cts-opengl-v8a.yaml
index 2ae2c3f..ed73a7f 100644
--- a/android/hikey-v2/template-cts-opengl-v8a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part1-v7a.yaml b/android/hikey-v2/template-cts-part1-v7a.yaml
index 3b53cd6..d0fbf36 100644
--- a/android/hikey-v2/template-cts-part1-v7a.yaml
+++ b/android/hikey-v2/template-cts-part1-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part1-v8a.yaml b/android/hikey-v2/template-cts-part1-v8a.yaml
index 71ba858..cf16761 100644
--- a/android/hikey-v2/template-cts-part1-v8a.yaml
+++ b/android/hikey-v2/template-cts-part1-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part2-v7a.yaml b/android/hikey-v2/template-cts-part2-v7a.yaml
index aa4275f..dcc5608 100644
--- a/android/hikey-v2/template-cts-part2-v7a.yaml
+++ b/android/hikey-v2/template-cts-part2-v7a.yaml
@@ -16,6 +16,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -32,8 +33,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -45,6 +47,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part2-v8a.yaml b/android/hikey-v2/template-cts-part2-v8a.yaml
index ad5a368..f0dc0b2 100644
--- a/android/hikey-v2/template-cts-part2-v8a.yaml
+++ b/android/hikey-v2/template-cts-part2-v8a.yaml
@@ -16,6 +16,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -32,8 +33,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -45,6 +47,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part3-v7a.yaml b/android/hikey-v2/template-cts-part3-v7a.yaml
index f2eb97b..f8f03dd 100644
--- a/android/hikey-v2/template-cts-part3-v7a.yaml
+++ b/android/hikey-v2/template-cts-part3-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part3-v8a.yaml b/android/hikey-v2/template-cts-part3-v8a.yaml
index 64739bd..39d35e0 100644
--- a/android/hikey-v2/template-cts-part3-v8a.yaml
+++ b/android/hikey-v2/template-cts-part3-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part4-v7a.yaml b/android/hikey-v2/template-cts-part4-v7a.yaml
index ebf63b9..0671f2f 100644
--- a/android/hikey-v2/template-cts-part4-v7a.yaml
+++ b/android/hikey-v2/template-cts-part4-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part4-v8a.yaml b/android/hikey-v2/template-cts-part4-v8a.yaml
index 0482c6e..d7a700f 100644
--- a/android/hikey-v2/template-cts-part4-v8a.yaml
+++ b/android/hikey-v2/template-cts-part4-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part5-v7a.yaml b/android/hikey-v2/template-cts-part5-v7a.yaml
index d34eeca..206431e 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-cts-part5-v8a.yaml b/android/hikey-v2/template-cts-part5-v8a.yaml
index 189418d..2c0b867 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-gearses2eclair.yaml b/android/hikey-v2/template-gearses2eclair.yaml
index 3e89e0a..3e6ef7f 100644
--- a/android/hikey-v2/template-gearses2eclair.yaml
+++ b/android/hikey-v2/template-gearses2eclair.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-geekbench3.yaml b/android/hikey-v2/template-geekbench3.yaml
index 84eac12..651c45c 100644
--- a/android/hikey-v2/template-geekbench3.yaml
+++ b/android/hikey-v2/template-geekbench3.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-glbenchmark25.yaml b/android/hikey-v2/template-glbenchmark25.yaml
index 09d0ee0..c85f1be 100644
--- a/android/hikey-v2/template-glbenchmark25.yaml
+++ b/android/hikey-v2/template-glbenchmark25.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-javawhetstone.yaml b/android/hikey-v2/template-javawhetstone.yaml
index fc75171..9592e6c 100644
--- a/android/hikey-v2/template-javawhetstone.yaml
+++ b/android/hikey-v2/template-javawhetstone.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-jbench.yaml b/android/hikey-v2/template-jbench.yaml
index 875f0de..f37182f 100644
--- a/android/hikey-v2/template-jbench.yaml
+++ b/android/hikey-v2/template-jbench.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-linpack.yaml b/android/hikey-v2/template-linpack.yaml
index c65941a..a9babc7 100644
--- a/android/hikey-v2/template-linpack.yaml
+++ b/android/hikey-v2/template-linpack.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-quadrantpro.yaml b/android/hikey-v2/template-quadrantpro.yaml
index 34cc20c..3e81a42 100644
--- a/android/hikey-v2/template-quadrantpro.yaml
+++ b/android/hikey-v2/template-quadrantpro.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-rl-sqlite.yaml b/android/hikey-v2/template-rl-sqlite.yaml
index 16ea19d..fc3a1dd 100644
--- a/android/hikey-v2/template-rl-sqlite.yaml
+++ b/android/hikey-v2/template-rl-sqlite.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-scimark.yaml b/android/hikey-v2/template-scimark.yaml
index ae43729..3e29437 100644
--- a/android/hikey-v2/template-scimark.yaml
+++ b/android/hikey-v2/template-scimark.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-vellamo3.yaml b/android/hikey-v2/template-vellamo3.yaml
index 9406d48..2905e16 100644
--- a/android/hikey-v2/template-vellamo3.yaml
+++ b/android/hikey-v2/template-vellamo3.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,8 +31,9 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
 - boot:
@@ -43,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-weekly.yaml b/android/hikey-v2/template-weekly.yaml
index 6a7d967..114169d 100644
--- a/android/hikey-v2/template-weekly.yaml
+++ b/android/hikey-v2/template-weekly.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,11 +31,11 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
-
 - boot:
     namespace: tlxc
     prompts:
@@ -44,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template-xtest-lmg.yaml b/android/hikey-v2/template-xtest-lmg.yaml
index e467f95..faf0deb 100644
--- a/android/hikey-v2/template-xtest-lmg.yaml
+++ b/android/hikey-v2/template-xtest-lmg.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,11 +31,11 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
-
 - boot:
     namespace: tlxc
     prompts:
@@ -44,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30
diff --git a/android/hikey-v2/template.yaml b/android/hikey-v2/template.yaml
index 923f0ff..b5b74ed 100644
--- a/android/hikey-v2/template.yaml
+++ b/android/hikey-v2/template.yaml
@@ -14,6 +14,7 @@ metadata:
   android.build: "%%ANDROID_META_BUILD%%"
   android.name: "%%ANDROID_META_NAME%%"
   android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
 
 protocols:
   lava-lxc:
@@ -30,11 +31,11 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - wget
+    - zip
+    - unzip
     os: ubuntu
 
-
 - boot:
     namespace: tlxc
     prompts:
@@ -44,6 +45,27 @@ actions:
       minutes: 5
     method: lxc
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
 - deploy:
     timeout:
       minutes: 30