Merge "Move NetworkStackTest to common folder to support cts"