am 2970474c: Merge "use longs instead of ints to store pointers in ObjectStreamClass"

* commit '2970474c200c48598dbbed8735cb5c83c8b5a57e':
  use longs instead of ints to store pointers in ObjectStreamClass