Source release 16.2.0

cdm/test/cdm_test_main.cpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 #if defined(__linux__)
-#include <sys/utsname.h>
+#  include <sys/utsname.h>
 #endif
 
 #include "cdm.h"
@@ -37,9 +37,6 @@ constexpr const char kExtraHelpText[] =
 }  // namespace
 
 int main(int argc, char** argv) {
-  // Init gtest and let it consume arguments.
-  ::testing::InitGoogleTest(&argc, argv);
-
   // Find and filter out the Sandbox ID, if any.
   std::vector<std::string> args(argv, argv + argc);
   auto sandbox_id_iter = std::find_if(std::begin(args) + 1, std::end(args),
@@ -90,5 +87,8 @@ int main(int argc, char** argv) {
     return 0;
   }
 
+  // Init gtest after oemcrypto and cdm host have been initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
   return RUN_ALL_TESTS();
 }