Merge "Fix more race conditions in WeakHashMapTest."