Merge changes Ic0304c29,I7fdb41aa

* changes:
  Add trace based window manager perf test
  Rename StubActivity to PerfTestActivity