Merge "Atest: replace shebang with python3."
diff --git a/atest/atest.py b/atest/atest.py
index 880288a..3da31fe 100755
--- a/atest/atest.py
+++ b/atest/atest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2017, The Android Open Source Project
 #
diff --git a/atest/atest_arg_parser.py b/atest/atest_arg_parser.py
index a3a2440..d8c5543 100644
--- a/atest/atest_arg_parser.py
+++ b/atest/atest_arg_parser.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Copyright 2018, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/atest/atest_arg_parser_unittest.py b/atest/atest_arg_parser_unittest.py
index fd4c321..a4fce6f 100755
--- a/atest/atest_arg_parser_unittest.py
+++ b/atest/atest_arg_parser_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/atest_execution_info_unittest.py b/atest/atest_execution_info_unittest.py
index f638f82..8024df9 100755
--- a/atest/atest_execution_info_unittest.py
+++ b/atest/atest_execution_info_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2019, The Android Open Source Project
 #
diff --git a/atest/atest_integration_tests.py b/atest/atest_integration_tests.py
index 3ed1247..5779429 100755
--- a/atest/atest_integration_tests.py
+++ b/atest/atest_integration_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/atest_metrics.py b/atest/atest_metrics.py
index d2ac3ad..5ab0a92 100755
--- a/atest/atest_metrics.py
+++ b/atest/atest_metrics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/atest_run_unittests.py b/atest/atest_run_unittests.py
index f23c59d..440d7b3 100755
--- a/atest/atest_run_unittests.py
+++ b/atest/atest_run_unittests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018 The Android Open Source Project
 #
diff --git a/atest/atest_unittest.py b/atest/atest_unittest.py
index 5600d75..f2b2809 100755
--- a/atest/atest_unittest.py
+++ b/atest/atest_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2017, The Android Open Source Project
 #
diff --git a/atest/atest_utils_unittest.py b/atest/atest_utils_unittest.py
index 85b2386..6b7a0b6 100755
--- a/atest/atest_utils_unittest.py
+++ b/atest/atest_utils_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/bug_detector_unittest.py b/atest/bug_detector_unittest.py
old mode 100644
new mode 100755
index a9356fc..d7ced5f
--- a/atest/bug_detector_unittest.py
+++ b/atest/bug_detector_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2019, The Android Open Source Project
 #
diff --git a/atest/cli_translator_unittest.py b/atest/cli_translator_unittest.py
index 1b6137b..11f6e8d 100755
--- a/atest/cli_translator_unittest.py
+++ b/atest/cli_translator_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2017, The Android Open Source Project
 #
diff --git a/atest/module_info_unittest.py b/atest/module_info_unittest.py
index 2570ab2..c982707 100755
--- a/atest/module_info_unittest.py
+++ b/atest/module_info_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/result_reporter_unittest.py b/atest/result_reporter_unittest.py
index 1a5221e..c703bc0 100755
--- a/atest/result_reporter_unittest.py
+++ b/atest/result_reporter_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_finder_handler_unittest.py b/atest/test_finder_handler_unittest.py
index 8f5e822..6b4801e 100755
--- a/atest/test_finder_handler_unittest.py
+++ b/atest/test_finder_handler_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_finders/cache_finder_unittest.py b/atest/test_finders/cache_finder_unittest.py
index 7797ea3..f37a975 100755
--- a/atest/test_finders/cache_finder_unittest.py
+++ b/atest/test_finders/cache_finder_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2019, The Android Open Source Project
 #
diff --git a/atest/test_finders/module_finder_unittest.py b/atest/test_finders/module_finder_unittest.py
index bba9434..e168877 100755
--- a/atest/test_finders/module_finder_unittest.py
+++ b/atest/test_finders/module_finder_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_finders/suite_plan_finder_unittest.py b/atest/test_finders/suite_plan_finder_unittest.py
index 0fed2d2..db09fdb 100755
--- a/atest/test_finders/suite_plan_finder_unittest.py
+++ b/atest/test_finders/suite_plan_finder_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_finders/test_finder_utils_unittest.py b/atest/test_finders/test_finder_utils_unittest.py
index db0496b..0b1aae4 100755
--- a/atest/test_finders/test_finder_utils_unittest.py
+++ b/atest/test_finders/test_finder_utils_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_finders/tf_integration_finder_unittest.py b/atest/test_finders/tf_integration_finder_unittest.py
index 170da0c..89c4f10 100755
--- a/atest/test_finders/tf_integration_finder_unittest.py
+++ b/atest/test_finders/tf_integration_finder_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_mapping_unittest.py b/atest/test_mapping_unittest.py
index 55cd839..4214970 100755
--- a/atest/test_mapping_unittest.py
+++ b/atest/test_mapping_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_runner_handler_unittest.py b/atest/test_runner_handler_unittest.py
index b5a430e..467dd7f 100755
--- a/atest/test_runner_handler_unittest.py
+++ b/atest/test_runner_handler_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2017, The Android Open Source Project
 #
diff --git a/atest/test_runners/atest_tf_test_runner_unittest.py b/atest/test_runners/atest_tf_test_runner_unittest.py
index 022bd97..3bbfda3 100755
--- a/atest/test_runners/atest_tf_test_runner_unittest.py
+++ b/atest/test_runners/atest_tf_test_runner_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_runners/event_handler_unittest.py b/atest/test_runners/event_handler_unittest.py
index 09069b2..44c02ec 100755
--- a/atest/test_runners/event_handler_unittest.py
+++ b/atest/test_runners/event_handler_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2019, The Android Open Source Project
 #
diff --git a/atest/test_runners/robolectric_test_runner_unittest.py b/atest/test_runners/robolectric_test_runner_unittest.py
index 46164f0..1ccb7a2 100755
--- a/atest/test_runners/robolectric_test_runner_unittest.py
+++ b/atest/test_runners/robolectric_test_runner_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_runners/suite_plan_test_runner_unittest.py b/atest/test_runners/suite_plan_test_runner_unittest.py
index 857452e..84e2c14 100755
--- a/atest/test_runners/suite_plan_test_runner_unittest.py
+++ b/atest/test_runners/suite_plan_test_runner_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/test_runners/vts_tf_test_runner_unittest.py b/atest/test_runners/vts_tf_test_runner_unittest.py
index 7e8b408..8009cdd 100755
--- a/atest/test_runners/vts_tf_test_runner_unittest.py
+++ b/atest/test_runners/vts_tf_test_runner_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018, The Android Open Source Project
 #
diff --git a/atest/tools/atest_tools.py b/atest/tools/atest_tools.py
index 8a59e07..d74ec2b 100755
--- a/atest/tools/atest_tools.py
+++ b/atest/tools/atest_tools.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2019, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/atest/tools/atest_tools_unittest.py b/atest/tools/atest_tools_unittest.py
index f53548f..3fd4dc6 100755
--- a/atest/tools/atest_tools_unittest.py
+++ b/atest/tools/atest_tools_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2019, The Android Open Source Project
 #
diff --git a/atest/unittest_utils.py b/atest/unittest_utils.py
index a57afac..605f44d 100644
--- a/atest/unittest_utils.py
+++ b/atest/unittest_utils.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Copyright 2017, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");