combined patch for:

http://codereview.chromium.org/1574005
http://codereview.chromium.org/1604001

Review URL: http://codereview.chromium.org/1585007
diff --git a/utils/kernel_image.c b/utils/kernel_image.c
index e66ce38..8c8c092 100644
--- a/utils/kernel_image.c
+++ b/utils/kernel_image.c
@@ -14,11 +14,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "cryptolib.h"
 #include "file_keys.h"
-#include "padding.h"
 #include "rollback_index.h"
-#include "rsa_utility.h"
-#include "sha_utility.h"
 #include "signature_digest.h"
 #include "utility.h"