Include the correct ar.go.

In typical style I forgot to push a new revision before
landing fd49993c3b94aef54669e095f1e6c417efb202aa. That change accidently
dropped patchset eight when I squashed David's changes in, so this
restores that and fixes a couple of 80-char issues in a Python script.

Change-Id: I7e9338a715c68ae5c89d9d1f7d03782b99af2aa8
Reviewed-on: https://boringssl-review.googlesource.com/14784
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 122a2b8..4225cf2 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -438,10 +438,12 @@
   return cmakefiles
 
 def OnlyFIPSFragments(path, dent, is_dir):
-  return is_dir or path.startswith(os.path.join('src', 'crypto', 'fipsmodule', ''))
+  return is_dir or path.startswith(
+      os.path.join('src', 'crypto', 'fipsmodule', ''))
 
 def NoTestsNorFIPSFragments(path, dent, is_dir):
-  return NoTests(path, dent, is_dir) and (is_dir or not OnlyFIPSFragments(path, dent, is_dir))
+  return (NoTests(path, dent, is_dir) and
+      (is_dir or not OnlyFIPSFragments(path, dent, is_dir)))
 
 def NoTests(path, dent, is_dir):
   """Filter function that can be passed to FindCFiles in order to remove test