Merge "Refactor the Nat464Xlat function for simplicity." am: 6bc322fc77

Change-Id: I4947abc132dcd0c83b44f2c23362049ee1073214
tree: c11c40c791bd86b367df3ff19ba3e7b1c272f031
  1. core/
  2. services/
  3. tests/