Update from https://crrev.com/318214

mojo/tools/roll/update_from_chromium.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import json
 import os
 import subprocess
 import sys
@@ skipping 51 matching lines @@
     "third_party/zlib",
     "tools/android",
     "tools/clang",
     "tools/gdb",
     "tools/generate_library_loader",
     "tools/git",
     "tools/gritsettings",
     "tools/idl_parser",
     "tools/json_comment_eater",
     "tools/linux",
-    "tools/lsan",
     "tools/msan",
     "tools/protoc_wrapper",
     "tools/relocation_packer",
     "tools/valgrind",
     "tools/vim",
     "tools/xdisplaycheck",
     "url",
     "ui/gl",
     ]
 
@@ skipping 47 matching lines @@
 
   print "Restoring files whose contents don't track Chromium"
   for f in files_not_to_roll:
     system(["git", "checkout", pre_roll_commit, "--", f], cwd=mojo_root_dir)
   if files_not_to_roll:
     commit("Restored pre-roll versions of files that don't get rolled")
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())