Do not use the OS and ARCH name in the snapshot version string (it causes

runtime/vm/snapshot.cc

Index: runtime/vm/snapshot.cc
===================================================================
--- runtime/vm/snapshot.cc	(revision 39619)
+++ runtime/vm/snapshot.cc	(working copy)
@@ -424,7 +424,8 @@
 
     // If the version string doesn't match, return an error.
     // NB: New things are allocated only if we're going to return an error.
-    if (!obj_.IsString() || !String::Cast(obj_).Equals(Version::String())) {
+    if (!obj_.IsString() ||
+        !String::Cast(obj_).Equals(Version::SnapshotString())) {
       const intptr_t kMessageBufferSize = 128;
       char message_buffer[kMessageBufferSize];
       OS::SNPrint(message_buffer,
@@ -431,7 +432,7 @@
                   kMessageBufferSize,
                   "Wrong full snapshot version. Found %s expected %s",
                   obj_.ToCString(),
-                  Version::String());
+                  Version::SnapshotString());
       const String& msg = String::Handle(String::New(message_buffer));
       return ApiError::New(msg);
     }
@@ -470,7 +471,8 @@
 
   // If the version string doesn't match, return an error.
   // NB: New things are allocated only if we're going to return an error.
-  if (!obj_.IsString() || !String::Cast(obj_).Equals(Version::String())) {
+  if (!obj_.IsString() ||
+      !String::Cast(obj_).Equals(Version::SnapshotString())) {
     const intptr_t kMessageBufferSize = 256;
     char message_buffer[kMessageBufferSize];
     OS::SNPrint(message_buffer,
@@ -477,7 +479,7 @@
                 kMessageBufferSize,
                 "Wrong script snapshot version. Found %s expected '%s'",
                 obj_.ToCString(),
-                Version::String());
+                Version::SnapshotString());
     const String& msg = String::Handle(String::New(message_buffer));
     return ApiError::New(msg);
   }
@@ -1249,7 +1251,7 @@
     ReserveHeader();
 
     // Write out the version string.
-    WriteObject(String::New(Version::String()));
+    WriteObject(String::New(Version::SnapshotString()));
 
     // Write out the full snapshot.
     {
@@ -1685,7 +1687,7 @@
     ReserveHeader();
 
     // Write out the version string.
-    WriteObject(String::New(Version::String()));
+    WriteObject(String::New(Version::SnapshotString()));
 
     // Write out the library object.
     {