Merge "Fix object identity hash." into dalvik-dev