Merge "Winscope: fix .pb location for sf traces"
am: 2f7f18d495

Change-Id: I73dc649e1b57561932bcc1b103e19038be78a243