Merge changes from topic "vts_fuzz_cp" am: 74f5bc1e0d
am: cfdd7de171

Change-Id: I3cb318ca275f9b674dcf47340e2997b3f16c9e7d
diff --git a/template/func_fuzzer_test/func_fuzzer_test.py b/template/func_fuzzer_test/func_fuzzer_test.py
index dcbbb3c..b4fbf04 100644
--- a/template/func_fuzzer_test/func_fuzzer_test.py
+++ b/template/func_fuzzer_test/func_fuzzer_test.py
@@ -51,6 +51,7 @@
                      self.hal_hidl_package_name)
 
         self._dut = self.registerController(android_device, False)[0]
+        self._dut.startAdbLogcat()
         self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR)
         self._vts_spec_parser = vts_spec_utils.VtsSpecParser(
             self.data_file_path)
diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
index 59d7ebb..8dde8f4 100644
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ b/template/iface_fuzzer_test/iface_fuzzer_test.py
@@ -111,8 +111,8 @@
             }
             libfuzzer_params = config.FUZZER_DEFAULT_PARAMS.copy()
             libfuzzer_params.update({
-                'max_len': 65536,
-                'max_total_time': 10,
+                'max_len': 16777216,
+                'max_total_time': 600,
             })
             bin_host_path = os.path.join(self.data_file_path, 'DATA', 'bin',
                                          'vts_proto_fuzzer')