Kill constants.h and fix some copyright headers.
Change-Id: I51c04d731d6de035328781d8ac134ad6fcf49897
diff --git a/src/common_test.h b/src/common_test.h
index e05a6d5..74056c9 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -20,15 +20,14 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "UniquePtr.h"
#include "class_linker.h"
#include "class_loader.h"
#include "compiler.h"
-#include "constants.h"
#include "dex_file.h"
#include "file.h"
#include "gtest/gtest.h"
#include "heap.h"
+#include "instruction_set.h"
#include "macros.h"
#include "oat_file.h"
#include "object_utils.h"
@@ -39,6 +38,7 @@
#include "thread.h"
#include "unicode/uclean.h"
#include "unicode/uvernum.h"
+#include "UniquePtr.h"
namespace art {