tree 3cd2e12bb598e1ba76905ca9db5ae553988bdb92
parent 3aefb6d7761c7c2f9c68779632609d793d46cfcd
author Winson Chung <winsonc@google.com> 1571250761 -0700
committer Winson Chung <winsonc@google.com> 1571254498 -0700

Fix a couple trace issues

- Adding trace tokens since we can be starting/ending traces out of order
- Fixing issue with draw hitting twice causing the trace stack to be
  popped twice
- Fix issue with endFlagOverrides not removing from the stack

Bug: 142803200

Change-Id: I8649b94249910a352f00f2f2c2459c355d2bab00