Merge "winscope: add options to specify surfaceflinger trace flags"