Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)"

This reverts commit https://codereview.webrtc.org/2963273002/
where the git cl format breaks include order on Windows.

BUG=webrtc:7634
NOTRY=True
TBR=kwiberg@webrtc.org

Review-Url: https://codereview.webrtc.org/2962303003 .
Cr-Commit-Position: refs/heads/master@{#18857}
diff --git a/webrtc/rtc_base/bufferqueue_unittest.cc b/webrtc/rtc_base/bufferqueue_unittest.cc
index 23d1751..07084c4 100644
--- a/webrtc/rtc_base/bufferqueue_unittest.cc
+++ b/webrtc/rtc_base/bufferqueue_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bufferqueue.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/bufferqueue.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {