Merge changes Ib0652654,I31111d16

* changes:
  ethernet: clean up test interface tracking
  ethernet: fix aosp <-> internal conflict