Merge "Make run-test give extra time when doing gc-stress runs."
am: 1160f2e

* commit '1160f2e14d61f95f3fb6bea03acb5451ad926acc':
  Make run-test give extra time when doing gc-stress runs.