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

webrtc/rtc_base/messagequeue.cc

Index: webrtc/rtc_base/messagequeue.cc
diff --git a/webrtc/rtc_base/messagequeue.cc b/webrtc/rtc_base/messagequeue.cc
index 3dd11426eb32e591ae3ef69252144f24d12efb69..883735c9cc771821248cc64f980a47523dc57316 100644
--- a/webrtc/rtc_base/messagequeue.cc
+++ b/webrtc/rtc_base/messagequeue.cc
@@ -23,16 +23,16 @@
 const int kMaxMsgLatency = 150;  // 150 ms
 const int kSlowDispatchLoggingThreshold = 50;  // 50 ms
 
-class RTC_SCOPED_LOCKABLE MarkProcessingCritScope {
+class SCOPED_LOCKABLE MarkProcessingCritScope {
  public:
   MarkProcessingCritScope(const CriticalSection* cs, size_t* processing)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(cs)
+      EXCLUSIVE_LOCK_FUNCTION(cs)
       : cs_(cs), processing_(processing) {
     cs_->Enter();
     *processing_ += 1;
   }
 
-  ~MarkProcessingCritScope() RTC_UNLOCK_FUNCTION() {
+  ~MarkProcessingCritScope() UNLOCK_FUNCTION() {
     *processing_ -= 1;
     cs_->Leave();
   }