Merge "Switch fatalError to NPE" am: d70e6c1fca am: 37aebe67e3
am: 4eaaa4d72f

Change-Id: I7227c2cdaca158ae6f47315ca112ddf5ea740ee9
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