Merge "Fix race condition in WeakHashMapTest."