Merge "Revert "Revert "ExpatParser LP64 fixes."""