Merge "Revert "Re-enable libcore test WeakHashMapTest#test_keySet.""
am: c6f27ac5f4

Change-Id: I1ef7c23bd614983e219d6bc00e9d21cb7ebb39b7