Merge "Do not reinitialize system properties to fake their values" am: 8cd8c8dd98 am: db701fd510
am: 59cad9269c

Change-Id: I1a6a92fcad7f18275d55da0baf9cb4ac21a58094
diff --git a/include_deprecated/JNIHelp.h b/include_deprecated/JNIHelp.h
deleted file mode 120000
index d4cf162..0000000
--- a/include_deprecated/JNIHelp.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/JNIHelp.h
\ No newline at end of file
diff --git a/include_deprecated/UniquePtr.h b/include_deprecated/UniquePtr.h
deleted file mode 120000
index e47c2a2..0000000
--- a/include_deprecated/UniquePtr.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/UniquePtr.h
\ No newline at end of file
diff --git a/include_deprecated/jni.h b/include_deprecated/jni.h
deleted file mode 120000
index 0f70e26..0000000
--- a/include_deprecated/jni.h
+++ /dev/null
@@ -1 +0,0 @@
-../include_jni/jni.h
\ No newline at end of file