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

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