Merge "ART: Use timeout --foreground"