Merge "Increase default timeout for ART gcstress tests"