Update Copyright to 2016 and cleanup
Remove vim comments
s/\/usr\/bin\/python3.4/\/usr\/bin\/env python3\.4/g
This is a cherry-pick of ag/839273 which was missed in the internal->external transition.
Change-Id: I0cde4f2a6989d6df91cf560fc6ef511c7ad405ff
diff --git a/acts/tests/google/bt/BtBasicFunctionalityTest.py b/acts/tests/google/bt/BtBasicFunctionalityTest.py
index 609d2b1..f491d13 100644
--- a/acts/tests/google/bt/BtBasicFunctionalityTest.py
+++ b/acts/tests/google/bt/BtBasicFunctionalityTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/SppTest.py b/acts/tests/google/bt/SppTest.py
index c55247f..5c9d683 100644
--- a/acts/tests/google/bt/SppTest.py
+++ b/acts/tests/google/bt/SppTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/gatt/GattOverBrEdrTest.py b/acts/tests/google/bt/gatt/GattOverBrEdrTest.py
index d05eed0..833a12f 100644
--- a/acts/tests/google/bt/gatt/GattOverBrEdrTest.py
+++ b/acts/tests/google/bt/gatt/GattOverBrEdrTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/native/BtNativeTest.py b/acts/tests/google/bt/native/BtNativeTest.py
index 8095442..d91eb1e 100644
--- a/acts/tests/google/bt/native/BtNativeTest.py
+++ b/acts/tests/google/bt/native/BtNativeTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/setup/BtPreFlightTest.py b/acts/tests/google/bt/setup/BtPreFlightTest.py
index cba93fc..8a2a4ca 100644
--- a/acts/tests/google/bt/setup/BtPreFlightTest.py
+++ b/acts/tests/google/bt/setup/BtPreFlightTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/system_tests/BtStressTest.py b/acts/tests/google/bt/system_tests/BtStressTest.py
index 847ea57..a298159 100644
--- a/acts/tests/google/bt/system_tests/BtStressTest.py
+++ b/acts/tests/google/bt/system_tests/BtStressTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/system_tests/SppStressTest.py b/acts/tests/google/bt/system_tests/SppStressTest.py
index 1e46608..a5561fe 100644
--- a/acts/tests/google/bt/system_tests/SppStressTest.py
+++ b/acts/tests/google/bt/system_tests/SppStressTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/test_tools/BtReconnectTest.py b/acts/tests/google/bt/test_tools/BtReconnectTest.py
index 3875862..ceda3b9 100644
--- a/acts/tests/google/bt/test_tools/BtReconnectTest.py
+++ b/acts/tests/google/bt/test_tools/BtReconnectTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/test_tools/EnergyTest.py b/acts/tests/google/bt/test_tools/EnergyTest.py
index 101b3ed..2015352 100644
--- a/acts/tests/google/bt/test_tools/EnergyTest.py
+++ b/acts/tests/google/bt/test_tools/EnergyTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
diff --git a/acts/tests/google/bt/test_tools/ToolsTest.py b/acts/tests/google/bt/test_tools/ToolsTest.py
index 4cff88e..3af087c 100644
--- a/acts/tests/google/bt/test_tools/ToolsTest.py
+++ b/acts/tests/google/bt/test_tools/ToolsTest.py
@@ -1,5 +1,6 @@
-# python3.4
-# Copyright (C) 2014 The Android Open Source Project
+#/usr/bin/env python3.4
+#
+# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of