diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk
index faecf44..2000493 100644
--- a/dumpstate/Android.mk
+++ b/dumpstate/Android.mk
@@ -14,9 +14,13 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate  vendor/google/libraries/dumpstate
+
+LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate
+
 LOCAL_SRC_FILES := dumpstate.cpp
+
 LOCAL_MODULE := libdumpstate.shamu
-LOCAL_WHOLE_STATIC_LIBRARIES := libdumpstate.google
+
 LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
index 6f8931d..8dfb3d0 100644
--- a/dumpstate/dumpstate.cpp
+++ b/dumpstate/dumpstate.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <dumpstate.h>
-#include <dumpstate_google.h>
 
 void dumpstate_board()
 {
@@ -45,7 +44,4 @@
     run_command("Subsystem Tombstone list", 5, SU_PATH, "root", "ls", "-l", "/data/tombstones/ramdump", NULL);
     run_command("ION CLIENTS", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in $(ls /d/ion/clients/*); do echo $f; cat $f; done", NULL);
     run_command("ION HEAPS",   5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in $(ls /d/ion/heaps/*);   do echo $f; cat $f; done", NULL);
-
-    // Dump Google-specific info.
-    dumpstate_google();
 };