Merge changes I5775d732,I27673017

* changes:
  [DO NOT MERGE] Add aosp config for winscope
  Create stub proto definitions for traces that are not available in AOSP