am 90fd3c91: (-s ours) Merge "Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."" into klp-dev

* commit '90fd3c919a841d1621a69b1f9a7e7fef1ad0a13a':
  Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."