vbutil: accept amd64 as a valid alias for x86

The rest of the chromiumos build system uses amd64 as the
architecture name for 64bit x86.  This adds support for this
name to vbutil.

BUG=chromium-os:21284
TEST=vbutil --arch amd64 should not return unknown architecture

Change-Id: I37531591a7a31486f6447ae611d54569d1ea59d5
Reviewed-on: http://gerrit.chromium.org/gerrit/9959
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/utility/vbutil_kernel.c b/utility/vbutil_kernel.c
index 757896a..0689675 100644
--- a/utility/vbutil_kernel.c
+++ b/utility/vbutil_kernel.c
@@ -873,7 +873,8 @@
 
       case OPT_ARCH:
         /* check the first 3 characters to also detect x86_64 */
-        if (!strncasecmp(optarg, "x86", 3))
+        if ((!strncasecmp(optarg, "x86", 3)) ||
+            (!strcasecmp(optarg, "amd64")))
           arch = ARCH_X86;
         else if (!strcasecmp(optarg, "arm"))
           arch = ARCH_ARM;