Merge "Frameworks/base: Fix a hashCode implementation"