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

Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff