diff --git a/runtime/base/logging.h b/runtime/base/logging.h
index 26ab1f9..5f84204 100644
--- a/runtime/base/logging.h
+++ b/runtime/base/logging.h
@@ -26,8 +26,8 @@
 namespace art {
 
 // Make libbase's LogSeverity more easily available.
-using LogSeverity = ::android::base::LogSeverity;
-using ScopedLogSeverity = ::android::base::ScopedLogSeverity;
+using ::android::base::LogSeverity;
+using ::android::base::ScopedLogSeverity;
 
 // The members of this struct are the valid arguments to VLOG and VLOG_IS_ON in code,
 // and the "-verbose:" command line argument.
diff --git a/runtime/jni_env_ext-inl.h b/runtime/jni_env_ext-inl.h
index 5967eee..685b056 100644
--- a/runtime/jni_env_ext-inl.h
+++ b/runtime/jni_env_ext-inl.h
@@ -33,8 +33,8 @@
       size_t entry_count = locals.Capacity();
       if (entry_count > 16) {
         locals.Dump(LOG_STREAM(WARNING) << "Warning: more than 16 JNI local references: "
-                                            << entry_count << " (most recent was a "
-                                            << PrettyTypeOf(obj) << ")\n");
+                                        << entry_count << " (most recent was a "
+                                        << PrettyTypeOf(obj) << ")\n");
       // TODO: LOG(FATAL) in a later release?
       }
     }
diff --git a/runtime/thread.cc b/runtime/thread.cc
index 7091e79..45a9be7 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -2786,7 +2786,7 @@
             GetThread()->Dump(LOG_STREAM(FATAL_WITHOUT_ABORT));
             space->AsImageSpace()->DumpSections(LOG_STREAM(FATAL_WITHOUT_ABORT));
             LOG(FATAL_WITHOUT_ABORT) << "Method@" << method->GetDexMethodIndex() << ":" << method
-                                << " klass@" << klass;
+                                     << " klass@" << klass;
             // Pretty info last in case it crashes.
             LOG(FATAL) << "Method " << PrettyMethod(method) << " klass " << PrettyClass(klass);
           }
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 0754640..03b03de 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -828,8 +828,8 @@
         if (total_delay >= MsToNs(kThreadSuspendTimeoutMs)) {
           ThreadSuspendByPeerWarning(self,
                                      ::android::base::FATAL,
-                                      "Thread suspension timed out",
-                                      peer);
+                                     "Thread suspension timed out",
+                                     peer);
           if (suspended_thread != nullptr) {
             CHECK_EQ(suspended_thread, thread);
             suspended_thread->ModifySuspendCount(soa.Self(), -1, nullptr, debug_suspension);