Merge remote branch 'cros/upstream' into master.

client/tests/kvm/kvm_preprocessing.py

 import os, time, commands, re, logging, glob, threading, shutil
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 import kvm_vm, kvm_utils, kvm_subprocess, kvm_monitor, ppm_utils, test_setup
 try:
     import PIL.Image
 except ImportError:
     logging.warning('No python imaging library installed. PPM image '
                     'conversion to JPEG disabled. In order to enable it, '
                     'please install python-imaging or the equivalent for your '
@@ skipping 345 matching lines @@
     # Kill all kvm_subprocess tail threads
     kvm_subprocess.kill_tail_threads()
 
     # Terminate tcpdump if no VMs are alive
     living_vms = [vm for vm in env.get_all_vms() if vm.is_alive()]
     if not living_vms and "tcpdump" in env:
         env["tcpdump"].close()
         del env["tcpdump"]
 
     if params.get("setup_hugepages") == "yes":
-        h = kvm_utils.HugePageConfig(params)
+        h = test_setup.HugePageConfig(params)
         h.cleanup()
 
     if params.get("type") == "enospc":
         e = test_setup.EnospcConfig(test, params)
         e.cleanup()
 
     # Execute any post_commands
     if params.get("post_command"):
         process_command(test, params, env, params.get("post_command"),
                         int(params.get("post_command_timeout", "600")),
@@ skipping 81 matching lines @@
                     image = PIL.Image.open(temp_filename)
                     image.save(screendump_filename, format="JPEG", quality=quality)
                     cache[hash] = screendump_filename
                 except NameError:
                     pass
             os.unlink(temp_filename)
         if _screendump_thread_termination_event.isSet():
             _screendump_thread_termination_event = None
             break
         _screendump_thread_termination_event.wait(delay)