Merge "Adjust gcstress/debug/target timeouts for libcore."
am: fb55d90776

Change-Id: I8463a8c6febdf7ab1dbe3d2296abb5425ea57e3e