diff --git a/aoc/Android.bp b/aoc/Android.bp
index 736f968..7af2424 100644
--- a/aoc/Android.bp
+++ b/aoc/Android.bp
@@ -10,7 +10,10 @@
         "-Wextra",
         "-Werror",
     ],
-    shared_libs: ["libbase"],
+    shared_libs: [
+        "libbase",
+	"libdump",
+    ],
     vendor: true,
     relative_install_path: "dump",
 }
diff --git a/aoc/dump_aoc.cpp b/aoc/dump_aoc.cpp
index a3e0088..97da3b5 100644
--- a/aoc/dump_aoc.cpp
+++ b/aoc/dump_aoc.cpp
@@ -14,28 +14,7 @@
  * limitations under the License.
  */
 #include <stdio.h>
-#include <string>
-#include <android-base/file.h>
-#include <fstream>
-#include <iostream>
-
-// Format title and content output.
-void dumpFileContent(const char* title, const char* file_path) {
-    std::string content;
-    printf("------ %s (%s) ------\n", title, file_path);
-    if (android::base::ReadFileToString(file_path, &content)) {
-        printf("%s\n", content.c_str());
-    } else {
-        printf("Unable to read %s\n", file_path);
-    }
-    return;
-}
-
-void command(const char* title, const char* cmd){
-    printf("------ %s (%s) ------\n", title, cmd);
-    system(cmd);
-    return;
-}
+#include <dump/pixel_dump.h>
 
 // Dump Aoc.
 int main() {
@@ -52,10 +31,10 @@
     dumpFileContent("AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception");
     dumpFileContent("AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_a32");
     dumpFileContent("AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_ff1");
-    command("clean AoC buffer","echo ' ' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
-    command("AoC Heap Stats (A32)", "echo 'dbg heap -c 1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
-    command("AoC Heap Stats (F1)", "echo 'dbg heap -c 2' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
-    command("AoC Heap Stats (HF0)", "echo 'dbg heap -c 3' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
-    command("AoC Heap Stats (HF1)", "echo 'dbg heap -c 4' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
+    runCommand("clean AoC buffer","echo ' ' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
+    runCommand("AoC Heap Stats (A32)", "echo 'dbg heap -c 1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
+    runCommand("AoC Heap Stats (F1)", "echo 'dbg heap -c 2' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
+    runCommand("AoC Heap Stats (HF0)", "echo 'dbg heap -c 3' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
+    runCommand("AoC Heap Stats (HF1)", "echo 'dbg heap -c 4' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
     return 0;
 }