Merge "Add another test that the slower gcstress causes timeouts"
am: 557204ac61

Change-Id: Ie39b7d85f86fe52e544c42105d59a9b45eb680d1