Fix a few bugs in the google3 sync scripts.

BUG=skia:

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

tools/git_clone_to_google3.sh

@@ -12,6 +12,7 @@
 
 source gbash.sh || exit
 DEFINE_string skia_rev "" "Git hash of Skia revision to clone, default LKGR."
+gbash::init_google "$@"
 
 set -x -e
 
@@ -48,8 +49,8 @@ rsync -avzJ \
   --include=/dm \
   --include=/gm \
   --include=/include \
-  --include=/src \
   --exclude=/src/animator \
+  --include=/src \
   --include=/tests \
   --include=/third_party \
   --include=/tools \
@@ -80,12 +81,17 @@ echo BUILD >> .git/info/exclude
 g4 revert README.google
 g4 revert BUILD
 
-# Use google3 version of OWNERS, README.google, and BUILD.
+# Use google3 version of OWNERS.
 find . \
-  \( -name OWNERS -o -name README.google -o -name BUILD \) \
+  -name OWNERS \
   -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" | \

tools/sync_google3.sh

@@ -25,7 +25,7 @@ if [ -z "${GOOGLE3}" ]; then
   GOOGLE3="/google/src/cloud/${USER}/${CLIENT_NAME}/google3"
 fi
 cd "${GOOGLE3}/third_party/skia/HEAD"
-${MY_DIR}/git_clone_to_google3.sh --skia-rev "${LKGR}"
+${MY_DIR}/git_clone_to_google3.sh --skia_rev "${LKGR}"
 
 # Update README.google.
 sed --in-place "s/^Version: .*/Version: ${LKGR}/" README.google