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

Change-Id: I19a21552361eea0110109093db28391ada462f39