Merge "cronet: change the test dirname to standard cronet/tests/cts format"