Merge branch 'master' into release

Change-Id: Iaeb2144000bba05bf9532a55518b9549d7662361

cpp/platform_v2/api/BUILD

@@ -86,6 +86,5 @@ cc_library(
         ":types",
         "//platform_v2/base",
         "//absl/strings",
-        "//absl/types:any",
     ],
 )

cpp/platform_v2/api/condition_variable.h

@@ -41,7 +41,6 @@ class ConditionVariable {
   // Waits while timeout has not expired for Notify to be called.
   // May return prematurely in case of interrupt, if supported by platform.
   // Returns kSuccess, or kInterrupted on interrupt.
-  // If Timeout expired, and Notify was not called, returns kTimeout.
   virtual Exception Wait(absl::Duration timeout) = 0;
 };
 

cpp/platform_v2/api/executor.h

@@ -21,6 +21,8 @@ namespace location {
 namespace nearby {
 namespace api {
 
+int GetCurrentTid();
+
 // This abstract class is the superclass of all classes representing an
 // Executor.
 class Executor {
@@ -33,6 +35,8 @@ class Executor {
 
   // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html#shutdown--
   virtual void Shutdown() = 0;
+
+  virtual int GetTid(int index) const = 0;
 };
 
 }  // namespace api