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

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