Merge changes Iba66536f,I9c74aab0

* changes:
  Refactor to support multiple files per trace in Winscope
  Add support for multiple files per trace in ADB Proxy