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