Merge "Make libcore timeout the same for all runs."