Merge "Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."" into klp-dev