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/cpu_time_unittest.cc b/webrtc/rtc_base/cpu_time_unittest.cc
index a9af7ba..bfdd7ef 100644
--- a/webrtc/rtc_base/cpu_time_unittest.cc
+++ b/webrtc/rtc_base/cpu_time_unittest.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/cpu_time.h"
-#include <algorithm>
 #include <memory>
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include <algorithm>
+#include "webrtc/base/cpu_time.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/test/gtest.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/gtest.h"
 
 // Only run these tests on non-instrumented builds, because timing on
 // instrumented builds is unreliable, causing the test to be flaky.