Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469