Snap for 6216739 from 6372fde5de60e3062c01f796b97820ea30c0de4e to rvc-release

Change-Id: I068945f7cda3d581763404af6b251ff625ead31e
diff --git a/ApiChecker.cpp b/ApiChecker.cpp
index 316a4b4..a628787 100644
--- a/ApiChecker.cpp
+++ b/ApiChecker.cpp
@@ -19,7 +19,6 @@
 #include <string>
 #include <unordered_map>
 
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {
diff --git a/Common.cpp b/Common.cpp
index b4f0e42..2278e04 100644
--- a/Common.cpp
+++ b/Common.cpp
@@ -40,8 +40,6 @@
 
 #include "sysprop.pb.h"
 
-using android::base::ErrnoErrorf;
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {
diff --git a/CppGen.cpp b/CppGen.cpp
index 25b1ea9..9c75eed 100644
--- a/CppGen.cpp
+++ b/CppGen.cpp
@@ -31,8 +31,6 @@
 #include "Common.h"
 #include "sysprop.pb.h"
 
-using android::base::ErrnoErrorf;
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {
diff --git a/CppMain.cpp b/CppMain.cpp
index a5cacc3..6f280fc 100644
--- a/CppMain.cpp
+++ b/CppMain.cpp
@@ -26,7 +26,6 @@
 
 #include "CppGen.h"
 
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {
diff --git a/JavaGen.cpp b/JavaGen.cpp
index 7e23dfb..7d7a9f0 100644
--- a/JavaGen.cpp
+++ b/JavaGen.cpp
@@ -31,8 +31,6 @@
 #include "Common.h"
 #include "sysprop.pb.h"
 
-using android::base::ErrnoErrorf;
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {
diff --git a/JavaMain.cpp b/JavaMain.cpp
index 370b00e..dc8058c 100644
--- a/JavaMain.cpp
+++ b/JavaMain.cpp
@@ -27,7 +27,6 @@
 #include "JavaGen.h"
 #include "sysprop.pb.h"
 
-using android::base::Errorf;
 using android::base::Result;
 
 namespace {