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

Change-Id: Ibf3fc645d475d6f726545c4887e5e07682e66bf4