Merge "CtsTestServer: Don't always use one port" into jb-dev