[automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 am: 5c76aad621 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 3f18aa996d is in history
Change-Id: I8c089ff672fc8f986adcc79e79ba92105f966fd0
This commit is contained in: