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