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

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