android hikey-v2: collect memory info for both 1st boot and 2nd boot

also fix typo in boottime template

Change-Id: I6b9ff1867c413c1b665596a9ed0fe1241293ed72
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey-v2/template-boottime.yaml b/android/hikey-v2/template-boottime.yaml
index 5892128..ec34319 100644
--- a/android/hikey-v2/template-boottime.yaml
+++ b/android/hikey-v2/template-boottime.yaml
@@ -112,7 +112,7 @@
       timeout:
         minutes: 300
       definitions:
-        - repository: https://git.linaro.org/people/yongqin.liu/public/test-definitions.git
+        - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/boottime/boottime.yaml
           name: first-boot-ignored
diff --git a/android/hikey-v2/template.yaml b/android/hikey-v2/template.yaml
index b5b74ed..d619124 100644
--- a/android/hikey-v2/template.yaml
+++ b/android/hikey-v2/template.yaml
@@ -115,7 +115,7 @@
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/meminfo/meminfo.yaml
-          name: meminfo
+          name: meminfo-first
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/busybox/busybox.yaml
@@ -132,3 +132,24 @@
           from: git
           path: automated/android/tjbench/tjbench.yaml
           name: tjbench
+
+- boot:
+    namespace: droid
+    connection: serial
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 15
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/meminfo/meminfo.yaml
+          name: meminfo-second