Merge "Add more timeout failures to target/debug/gcstress."
am: 5ab74a0b54

Change-Id: I54cddfaec7687bf1d58b3a2ddc4f74e681d5e88f