Revert "Revert "ExpatParser LP64 fixes.""

This reverts commit d88231f770f7459dc174aa970e305aa5f16f9f04.

Change-Id: Iac6b50221aa1e4cfe8514ea693a4289d74e118de
2 files changed