Merge "use longs instead of ints to store pointers in ObjectStreamClass"