Merge "ART: Use timeout --foreground" am: 26d5a3e394
am: d33db43349

Change-Id: I6f6703717a83300461bd8ed7c527295f6db53b27