Search for buildtools in the gclient root, if not in the main repo.

BUG=https://code.google.com/p/chromium/issues/detail?id=430602
R=bradnelson@google.com, dpranke@chromium.org

Review URL: https://codereview.chromium.org/718213002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292912 0039d316-1c4b-4281-b951-d872f2087c98

gclient_utils.py

@@ -684,7 +684,11 @@ def GetBuildtoolsPath():
 
   # Some projects' top directory is not named 'src'.
   source_dir_name = GetGClientPrimarySolutionName(gclient_root) or 'src'
-  return os.path.join(gclient_root, source_dir_name, 'buildtools')
+  buildtools_path = os.path.join(gclient_root, source_dir_name, 'buildtools')
+  if not os.path.exists(buildtools_path):
+    # Buildtools may be in the gclient root.
+    buildtools_path = os.path.join(gclient_root, 'buildtools')
+  return buildtools_path
 
 
 def GetBuildtoolsPlatformBinaryPath():