Update LSAN suppressions.

Seems the obvious thing works now.

Ran nanobench,
-----------------------------------------------------
Suppressions used:
  count      bytes template
    586    3530064 libGL.so
-----------------------------------------------------

and dm,
-----------------------------------------------------
Suppressions used:
  count      bytes template
    340    2048160 libGL.so
-----------------------------------------------------

BUG=skia:
R=robertphillips@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/517133002
diff --git a/Makefile b/Makefile
index f8ec875..29831bb 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@
 # TODO(epoger): I'm not sure if the above comment is still valid in a ninja
 # world.
 VALID_TARGETS := \
-                 bench \
+                 nanobench \
                  debugger \
                  dm \
                  everything \
diff --git a/tools/lsan.supp b/tools/lsan.supp
index 6a274c0..c8363a5 100644
--- a/tools/lsan.supp
+++ b/tools/lsan.supp
@@ -2,15 +2,8 @@
 #   tools/xsan_build address -C out/Debug
 #   ASAN_OPTIONS=detect_leaks=1 LSAN_OPTIONS=suppressions=tools/lsan.supp out/Debug/$FOO
 
-# Ignore fontconfig leaks.
-leak:FcFontSet
-leak:FcPatternObject
+# Fontconfig
+leak:libfontconfig
 
-# It'd be really nice to supress these leaks in the Nvidia driver, but I can't figure it out.
-# Direct leak of 18072 byte(s) in 3 object(s) allocated from:
-#   #0 0x5ebb59 in calloc ~/llvm-3.4/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:90
-#   #1 0x7f66af293b1e (/usr/lib/nvidia-current/libGL.so.1+0xbcb1e)
-
-# Skia leaks
-leak:SkRTConf
-leak:SkFontMgr
+# Nvidia driver
+leak:libGL.so