Update valgrind suppressions

It appears that the top-level function named has switched to just "main"

Change-Id: I33a18a8d433867e759312d09e5b258f934f495a4
Reviewed-on: https://skia-review.googlesource.com/8194
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/tools/valgrind.supp b/tools/valgrind.supp
index 1399c3e..601b3a7 100644
--- a/tools/valgrind.supp
+++ b/tools/valgrind.supp
@@ -1,26 +1,14 @@
 # Pass this file to Valgrind with "--suppressions=tools/valgrind.supp"
 
-# Intentional thread / memory leak in DM.
+# Intentional thread / memory leak in DM and nanbench.
 {
-   dm_keepalive_thread_leak
+   nanobench_and_dm_keepalive_thread_leak
    Memcheck:Leak
    match-leak-kinds: possible
    ...
    fun:_ZN8SkThreadC1EPFvPvES0_
    ...
-   fun:_Z7dm_mainv
-   ...
-}
-
-# Intentional thread / memory leak in nanobench.
-{
-   nanobench_keepalive_thread_leak
-   Memcheck:Leak
-   match-leak-kinds: possible
-   ...
-   fun:_ZN8SkThreadC1EPFvPvES0_
-   ...
-   fun:_Z14nanobench_mainv
+   fun:main
    ...
 }