Merge changes I664fb325,I5e289469 am: 701001688f

am: 833a491fab

Change-Id: If9ccdbfe5ee734c9cbd95a0c7bef04e6336d6f48

cmds/incident_helper/tests/ih_util_test.cpp

@@ -17,7 +17,6 @@
 #include "ih_util.h"
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <string>

cmds/incidentd/tests/FdBuffer_test.cpp

@@ -17,13 +17,13 @@
 #include "FdBuffer.h"
 #include "incidentd_util.h"
 
-#include <android-base/file.h>
-#include <android-base/test_utils.h>
 #include <fcntl.h>
-#include <gtest/gtest.h>
 #include <signal.h>
 #include <string.h>
 
+#include <android-base/file.h>
+#include <gtest/gtest.h>
+
 using namespace android;
 using namespace android::base;
 using namespace android::os::incidentd;

cmds/incidentd/tests/Reporter_test.cpp

@@ -19,12 +19,12 @@
 #include <android/os/BnIncidentReportStatusListener.h>
 #include <frameworks/base/libs/incident/proto/android/os/header.pb.h>
 
-#include <android-base/file.h>
-#include <android-base/test_utils.h>
 #include <dirent.h>
+#include <string.h>
+
+#include <android-base/file.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <string.h>
 
 using namespace android;
 using namespace android::base;
@@ -197,4 +197,4 @@ TEST_F(ReporterTest, ReportMetadata) {
     EXPECT_EQ(1, metadata.request_size());
     EXPECT_TRUE(metadata.use_dropbox());
     EXPECT_EQ(0, metadata.sections_size());
-}
+}

cmds/incidentd/tests/Throttler_test.cpp

@@ -16,7 +16,6 @@
 
 #include "Throttler.h"
 
-#include <android-base/test_utils.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

tools/aapt2/io/FileStream_test.cpp

@@ -18,7 +18,6 @@
 
 #include "android-base/file.h"
 #include "android-base/macros.h"
-#include "android-base/test_utils.h"
 
 #include "test/Test.h"