Revert of Fix a few bugs in the google3 sync scripts.

tools/git_clone_to_google3.sh

 #!/bin/bash
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Crude script to clone the git skia repo into the current directory, which
 # must be a CitC client.
 #
 # Usage:
 #      ./tools/git_clone_to_google3.sh
 
 source gbash.sh || exit
 DEFINE_string skia_rev "" "Git hash of Skia revision to clone, default LKGR."
-gbash::init_google "$@"
 
 set -x -e
 
 # To run this script after making edits, run:
 # g4 revert -k git_clone_to_google3.sh
 # To get the file back into your CL, run:
 # g4 edit git_clone_to_google3.sh
 #g4 opened | grep -q "//depot" && gbash::die "Must run in a clean client."
 
 # Checkout LKGR of Skia in a temp location.
@@ skipping 16 matching lines @@
 # Use allwrite to simplify opening the correct files after rsync.
 g4 client --set_option allwrite
 # Filter directories added to CitC.
 rsync -avzJ \
   --delete \
   --delete-excluded \
   --include=/bench \
   --include=/dm \
   --include=/gm \
   --include=/include \
+  --include=/src \
   --exclude=/src/animator \
-  --include=/src \
   --include=/tests \
   --include=/third_party \
   --include=/tools \
   --include=/.git \
   '--exclude=/*/' \
   --include=/third_party/etc1 \
   --include=/third_party/ktx \
   --include=/third_party/libwebp \
   '--exclude=/third_party/*/' \
   "${TMP}/skia/" \
@@ skipping 10 matching lines @@
   -o -name .gitignore \
   \) \
   -execdir g4 revert -k \{\} \;
 
 # Tell Git to ignore README.google and BUILD.
 echo README.google >> .git/info/exclude
 echo BUILD >> .git/info/exclude
 g4 revert README.google
 g4 revert BUILD
 
-# Use google3 version of OWNERS.
+# Use google3 version of OWNERS, README.google, and BUILD.
 find . \
-  -name OWNERS \
+  \( -name OWNERS -o -name README.google -o -name BUILD \) \
   -exec git update-index --skip-worktree \{\} \; \
   -execdir g4 revert \{\} \;
 
-# Tell git to ignore these files that have Windows line endings, because Piper
-# will always change them to Unix line endings.
-git update-index --skip-worktree make.bat
-git update-index --skip-worktree make.py
-
 # Tell git to ignore files left out of the rsync (i.e. "deleted" files).
 git status --porcelain | \
   grep -e "^ D" | \
   cut -c 4- | \
   xargs git update-index --skip-worktree