am 695e6d1e: am 3e93a511: Merge "use longs instead of ints to store pointers in ExpatParser"

* commit '695e6d1eac0bff93dd001af642b8c5cf25bd965f':
  use longs instead of ints to store pointers in ExpatParser