Merge "Covert list<String> into String[] in INetd" am: d274332a9d
am: 8fd6b59224

Change-Id: Ia95981369d5840ad3b9489e47e0534dde49789ed