base

Merge change Idcaa1ef8 into eclair

* changes:
  1) Add 10 seconds wait time before collecting the end memory. 2) Modified the player stress test, shorten the plabyack time.