Revert of Rename thread annotation macros to have RTC prefix for syncrhonization primitives.

webrtc/rtc_base/signalthread.h

Index: webrtc/rtc_base/signalthread.h
diff --git a/webrtc/rtc_base/signalthread.h b/webrtc/rtc_base/signalthread.h
index 1c6c87625678548f1c71b8e05008ebe27fd42b07..f6722a7282f984e1b1254be26fb8af7b838b3718 100644
--- a/webrtc/rtc_base/signalthread.h
+++ b/webrtc/rtc_base/signalthread.h
@@ -119,9 +119,9 @@
     RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Worker);
   };
 
-  class RTC_SCOPED_LOCKABLE EnterExit {
+  class SCOPED_LOCKABLE EnterExit {
    public:
-    explicit EnterExit(SignalThread* t) RTC_EXCLUSIVE_LOCK_FUNCTION(t->cs_)
+    explicit EnterExit(SignalThread* t) EXCLUSIVE_LOCK_FUNCTION(t->cs_)
         : t_(t) {
       t_->cs_.Enter();
       // If refcount_ is zero then the object has already been deleted and we
@@ -129,7 +129,7 @@
       RTC_DCHECK_NE(0, t_->refcount_);
       ++t_->refcount_;
     }
-    ~EnterExit() RTC_UNLOCK_FUNCTION() {
+    ~EnterExit() UNLOCK_FUNCTION() {
       bool d = (0 == --t_->refcount_);
       t_->cs_.Leave();
       if (d)