am 47c61891: am 31e8ef04: Merge "Fix race condition in WeakHashMapTest."

* commit '47c61891491acce74675622abf3132ff03464ae5':
  Fix race condition in WeakHashMapTest.