Make args package follow new layout.

utils/testrunner/options.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /** Create and return an options parser for the test runner. */
 ArgParser getOptionParser() {
   var parser = new ArgParser();
 
   parser.addOption('help', abbr: '?',
       help: 'Show usage information.');
@@ skipping 202 matching lines @@
       }
     }
   }
   // Finally, we add options from the command line. These have the highest
   // precedence of all.
   options.addAll(commandLineArgs);
   // Now try parse the whole collection of options, and if this fails,
   // issue a usage message.
   try {
     return optionsParser.parse(options);
-  } catch (var e) {
+  } catch (e) {
     print(e);
     print('Usage: testrunner <options> [<directory or file> ...]');
     print(optionsParser.getUsage());
     return null;
   }
 }
 
 /** Perform some sanity checking of the configuration. */
 bool isSane(ArgResults config) {
   if (config == null) {
@@ skipping 13 matching lines @@
     return false;
   }
   if (config['layout'] && config['runtime'] == 'vm') {
     print('Layout tests must use --runtime values of "drt-dart" or "drt-js"');
     return false;
   }
   return true;
 }