Fix building of other utilities

Fix building all applypatch items
Fix building verifier_test (probably will not work right as-is)
but at least it builds without errors.

Change-Id: I7ab0c04d7d3d2c2e14b57480627e594f89a68b0b
diff --git a/verifier_test.cpp b/verifier_test.cpp
index 1063cba..20aa3d1 100644
--- a/verifier_test.cpp
+++ b/verifier_test.cpp
@@ -18,7 +18,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+/*
 #include "common.h"
+*/
 #include "verifier.h"
 #include "ui.h"
 #include "mincrypt/sha.h"
@@ -163,7 +165,10 @@
 
     ui = new FakeUI();
 
+/*
     int result = verify_file(*argv, cert, num_keys);
+*/
+    int result = verify_file(*argv);
     if (result == VERIFY_SUCCESS) {
         printf("VERIFIED\n");
         return 0;