Merge remote branch 'cros/upstream' into master

client/tools/autotest

Index: client/tools/autotest
diff --git a/client/tools/autotest b/client/tools/autotest
index 061afcbc8882251d027e950845c978a94f792273..13fe1cc9dca7d4f6da432cf5de10433b82b5efe1 100755
--- a/client/tools/autotest
+++ b/client/tools/autotest
@@ -2,13 +2,20 @@
 import sys,os
 
 autodir = None
-if os.path.exists('/etc/autotest.conf'):
-    autodir = os.path.dirname(os.path.realpath('/etc/autotest.conf'))
+autotest_conf = os.path.realpath('/etc/autotest.conf')
+
+if os.path.isfile(autotest_conf):
+    autodir = os.path.dirname(autotest_conf)
+
 if not autodir:
     for path in ['/usr/local/autotest', '/home/autotest']:
         if os.path.exists(os.path.join(path, 'bin/autotest')):
             autodir = path
 
+if not autodir:
+    print "Autotest home dir NOT FOUND"
+    sys.exit()
+
 autotest = os.path.join(autodir, 'bin/autotest')
 control = os.path.join(autodir, 'control')
 state = os.path.join(autodir, 'control.state')