A few additional fixes for infra refactoring in testing_support

setup.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-try:
-  from setuptools import setup
-except ImportError:
-  from distutils.core import setup
+from setuptools import setup, find_packages
 
 import ast
 
 
 def read_vars(path):
   ret = {}
   with open(path) as f:
     for n in ast.walk(ast.parse(f.read())):
       if isinstance(n, ast.Module):
         ret['__doc__'] = ast.get_docstring(n)
       elif isinstance(n, ast.Assign):
         if isinstance(n.targets[0], ast.Name) and isinstance(n.value, ast.Str):
           ret[n.targets[0].id] = n.value.s
   return ret
 
 
 NAME = 'testing_support'
 VARS = read_vars(NAME + '/__init__.py')
 
 
 setup(
-  name=NAME,
-  version=VARS['__version__'],
-  description=VARS['__doc__'].splitlines()[0],
-  long_description=open('README.md').read(),
-  author=VARS['__author__'],
-  author_email=VARS['__email__'],
-  url=VARS['__url__'],
-  packages=[NAME],
+    name=NAME,
+    version=VARS['__version__'],
+    description=VARS['__doc__'].splitlines()[0],
+    long_description=open('README.md').read(),
+    author=VARS['__author__'],
+    author_email=VARS['__email__'],
+    url=VARS['__url__'],
+    packages=find_packages()
 )