ART: Include cleanup

Let clang-format reorder the header includes.

Derived with:

* .clang-format:
 BasedOnStyle: Google
 IncludeIsMainRegex: '(_test|-inl)?$'

* Steps:
 find . -name '*.cc' -o -name '*.h' | xargs sed -i.bak -e 's/^#include/ #include/' ; git commit -a -m 'ART: Include cleanup'
 git-clang-format -style=file HEAD^
 manual inspection
 git commit -a --amend

Test: mmma art
Change-Id: Ia963a8ce3ce5f96b5e78acd587e26908c7a70d02

7 files changed, 21 insertions, 19 deletions

diff --git a/cmdline/cmdline_parser.h b/cmdline/cmdline_parser.h
index 32480dd915..804727bdcd 100644
--- a/cmdline/cmdline_parser.h
+++ b/cmdline/cmdline_parser.h
@@ -19,20 +19,20 @@
 
 #define CMDLINE_NDEBUG 1  // Do not output any debugging information for parsing.
 
-#include "cmdline/detail/cmdline_parser_detail.h"
-#include "cmdline/detail/cmdline_parse_argument_detail.h"
 #include "cmdline/detail/cmdline_debug_detail.h"
+#include "cmdline/detail/cmdline_parse_argument_detail.h"
+#include "cmdline/detail/cmdline_parser_detail.h"
 
+#include "cmdline_parse_result.h"
+#include "cmdline_result.h"
 #include "cmdline_type_parser.h"
-#include "token_range.h"
 #include "cmdline_types.h"
-#include "cmdline_result.h"
-#include "cmdline_parse_result.h"
+#include "token_range.h"
 
 #include "runtime/base/variant_map.h"
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace art {
 // Build a parser for command line arguments with a small domain specific language.
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc
index d957869a76..3c4f376753 100644
--- a/cmdline/cmdline_parser_test.cc
+++ b/cmdline/cmdline_parser_test.cc
@@ -15,14 +15,16 @@
  */
 
 #include "cmdline_parser.h"
-#include "runtime/runtime_options.h"
-#include "runtime/parsed_options.h"
 
-#include "utils.h"
 #include <numeric>
+
 #include "gtest/gtest.h"
+
 #include "runtime/experimental_flags.h"
+#include "runtime/parsed_options.h"
 #include "runtime/runtime.h"
+#include "runtime/runtime_options.h"
+#include "utils.h"
 
 #define EXPECT_NULL(expected) EXPECT_EQ(reinterpret_cast<const void*>(expected), \
                                         reinterpret_cast<void*>(nullptr));
diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h
index 4de8a48d45..20c4a7ed62 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -20,9 +20,9 @@
 
 #include <list>
 
-#include "memory_representation.h"
-#include "detail/cmdline_debug_detail.h"
 #include "cmdline_type_parser.h"
+#include "detail/cmdline_debug_detail.h"
+#include "memory_representation.h"
 
 #include "android-base/strings.h"
 
diff --git a/cmdline/detail/cmdline_parse_argument_detail.h b/cmdline/detail/cmdline_parse_argument_detail.h
index da03c2198f..ceb6fa718a 100644
--- a/cmdline/detail/cmdline_parse_argument_detail.h
+++ b/cmdline/detail/cmdline_parse_argument_detail.h
@@ -17,13 +17,13 @@
 #ifndef ART_CMDLINE_DETAIL_CMDLINE_PARSE_ARGUMENT_DETAIL_H_
 #define ART_CMDLINE_DETAIL_CMDLINE_PARSE_ARGUMENT_DETAIL_H_
 
-#include <type_traits>
 #include <assert.h>
-#include <functional>
-#include <vector>
 #include <algorithm>
-#include <numeric>
+#include <functional>
 #include <memory>
+#include <numeric>
+#include <type_traits>
+#include <vector>
 
 #include "android-base/strings.h"
 
diff --git a/cmdline/detail/cmdline_parser_detail.h b/cmdline/detail/cmdline_parser_detail.h
index 24dbca2642..118628fdec 100644
--- a/cmdline/detail/cmdline_parser_detail.h
+++ b/cmdline/detail/cmdline_parser_detail.h
@@ -17,8 +17,8 @@
 #ifndef ART_CMDLINE_DETAIL_CMDLINE_PARSER_DETAIL_H_
 #define ART_CMDLINE_DETAIL_CMDLINE_PARSER_DETAIL_H_
 
-#include <string>
 #include <sstream>
+#include <string>
 #include <vector>
 
 namespace art {
diff --git a/cmdline/memory_representation.h b/cmdline/memory_representation.h
index 2619c317e3..8db68bc9a4 100644
--- a/cmdline/memory_representation.h
+++ b/cmdline/memory_representation.h
@@ -17,9 +17,9 @@
 #ifndef ART_CMDLINE_MEMORY_REPRESENTATION_H_
 #define ART_CMDLINE_MEMORY_REPRESENTATION_H_
 
-#include <string>
 #include <assert.h>
 #include <ostream>
+#include <string>
 
 #include "base/bit_utils.h"
 
diff --git a/cmdline/token_range.h b/cmdline/token_range.h
index c22d6c8959..642bb1d34c 100644
--- a/cmdline/token_range.h
+++ b/cmdline/token_range.h
@@ -18,10 +18,10 @@
 #define ART_CMDLINE_TOKEN_RANGE_H_
 
 #include <assert.h>
-#include <vector>
-#include <string>
 #include <algorithm>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "android-base/strings.h"