Simplified CPU/CpuFeatures a bit.

src/mksnapshot.cc

Index: src/mksnapshot.cc
diff --git a/src/mksnapshot.cc b/src/mksnapshot.cc
index 9f91b832a7a845d72b60eca9b178b51c9fc871a4..f3a652f27537a6b411315915bfb98c019598af31 100644
--- a/src/mksnapshot.cc
+++ b/src/mksnapshot.cc
@@ -301,15 +301,9 @@ int main(int argc, char** argv) {
   // By default, log code create information in the snapshot.
   i::FLAG_log_code = true;
 
-#if V8_TARGET_ARCH_ARM
-  // Printing flags on ARM requires knowing if we intend to enable
-  // the serializer or not.
-  v8::internal::CpuFeatures::SetHintCreatingSnapshot();
-#endif
-
   // Print the usage if an error occurs when parsing the command line
   // flags or if the help flag is set.
-  int result = i::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
+  int result = i::FlagList::SetFlagsFromCommandLine(&argc, argv, true, true);
   if (result > 0 || argc != 2 || i::FLAG_help) {
     ::printf("Usage: %s [flag] ... outfile\n", argv[0]);
     i::FlagList::PrintHelp();