Merge "Remove global headers." am: 43be68ba2f am: 9185ac6837 am: a5b86ec778 am: 5837ce6278
am: 8681489fef

Change-Id: I8db35b81879915af7974630acf9e4f962c821452
diff --git a/include_deprecated/ScopedPrimitiveArray.h b/include_deprecated/ScopedPrimitiveArray.h
deleted file mode 120000
index 1105bd3..0000000
--- a/include_deprecated/ScopedPrimitiveArray.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/ScopedPrimitiveArray.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedStringChars.h b/include_deprecated/ScopedStringChars.h
deleted file mode 120000
index b23058a..0000000
--- a/include_deprecated/ScopedStringChars.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/ScopedStringChars.h
\ No newline at end of file