Merge "gltrace: Use Unix Domain Socket rather than INET Socket"