Small cleanups and linter fixes.

runtime/vm/instructions_x64.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
+#include "vm/instructions.h"
+#include "vm/instructions_x64.h"
+
 #include "vm/cpu.h"
 #include "vm/constants_x64.h"
-#include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {
 
 bool DecodeLoadObjectFromPoolOrThread(uword pc,
                                       const Code& code,
                                       Object* obj) {
   ASSERT(code.ContainsInstructionAt(pc));
 
   uint8_t* bytes = reinterpret_cast<uint8_t*>(pc);
@@ skipping 38 matching lines @@
     uint8_t offset = *reinterpret_cast<uint8_t*>(pc + 3);
     return Thread::ObjectAtOffset(offset, obj);
   }
 
   return false;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64