Merge "Update static copy of winscope" am: 9ec02b3ba2 am: 09c65514e4
am: ce5988fd49

Change-Id: If63576bdc65ec574271b1bef190e727f43df43fd