Merge changes I5b3ca4f0,I610bed59 am: c941236374

Change-Id: I6c8070e3d2ac72465a086890ea8331ac582aab7d

liblog/tests/Android.bp

@@ -72,6 +72,7 @@ cc_defaults {
     ],
     static_libs: ["liblog"],
     isolated: true,
+    require_root: true,
 }
 
 // Build tests for the device (with .so). Run with:

liblog/tests/logd_writer_test.cpp

@@ -29,6 +29,10 @@ using android::base::unique_fd;
 // socket.  This tests for that behavior.
 TEST(liblog, multi_connect_dgram_socket) {
 #ifdef __ANDROID__
+  if (getuid() != 0) {
+    GTEST_SKIP() << "Skipping test, must be run as root.";
+    return;
+  }
   auto temp_dir = TemporaryDir();
   auto socket_path = StringPrintf("%s/test_socket", temp_dir.path);