Merge "Fix extra test runner args command line." into studio-1.4-dev