Merge "Fix ParseInt/ParseUint to handle explicit "0x" hex."