Snap for 5822255 from e43bf07aa4300712fc5f15d9b6baeb62dfc77c7b to r-keystone-qcom-release

Change-Id: Ia0a9dbd4ee220127d297100a70476b23a9f45fa3
diff --git a/tests/os_unittest.cpp b/tests/os_unittest.cpp
index 0cfb493..a014973 100644
--- a/tests/os_unittest.cpp
+++ b/tests/os_unittest.cpp
@@ -38,8 +38,9 @@
 namespace {
 
 using ::testing::_;
-using ::testing::Invoke;
+using ::testing::DoAll;
 using ::testing::InSequence;
+using ::testing::Invoke;
 using ::testing::Matcher;
 using ::testing::MatcherInterface;
 using ::testing::MatchResultListener;
@@ -48,8 +49,8 @@
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
 using ::testing::SetErrnoAndReturn;
-using ::testing::StrictMock;
 using ::testing::StrEq;
+using ::testing::StrictMock;
 
 using local_utils::GetMaxVal;