Fixup testenv config for interface names.

Change-Id: I619a7a1b94535d46e3e2a40eeb82aabeb56b1957
Merge "Fixup testenv config for interface names."