EDK: Move mutex.*, cond_var.*, and thread_annotations.h to //mojo/edk/util.

mojo/edk/util/BUILD.gn

Index: mojo/edk/util/BUILD.gn
diff --git a/mojo/edk/util/BUILD.gn b/mojo/edk/util/BUILD.gn
index 775e1a6f92e2002735fe5805fb1e6ca426e988da..6b305838037e889c10b53f5cefe79a403f82d3d9 100644
--- a/mojo/edk/util/BUILD.gn
+++ b/mojo/edk/util/BUILD.gn
@@ -6,12 +6,19 @@ import("../mojo_edk.gni")
 
 mojo_edk_source_set("util") {
   sources = [
+    "cond_var.cc",
+    "cond_var.h",
+    "logging_internal.cc",
+    "logging_internal.h",
     "make_unique.h",
+    "mutex.cc",
+    "mutex.h",
     "ref_counted.h",
     "ref_counted_internal.h",
     "ref_ptr.h",
     "ref_ptr_internal.h",
     "scoped_file.h",
+    "thread_annotations.h",
   ]
 
   mojo_edk_configs = [ "mojo/edk/system:system_config" ]
@@ -24,15 +31,20 @@ mojo_edk_source_set("unittests") {
   mojo_edk_visibility = [ "mojo/edk/system:mojo_system_unittests" ]
 
   sources = [
+    "cond_var_unittest.cc",
+    "mutex_unittest.cc",
     "ref_counted_unittest.cc",
+    "thread_annotations_unittest.cc",
   ]
 
-  mojo_sdk_deps = [ "mojo/public/cpp/system" ]
-
   deps = [
     ":util",
     "//testing/gtest",
   ]
+
+  mojo_sdk_deps = [ "mojo/public/cpp/system" ]
+
+  mojo_edk_deps = [ "mojo/edk/system/test" ]
 }
 
 mojo_edk_source_set("perftests") {