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

Change-Id: If3551bedba80c9a13041d5fbf6ea2f19c7554f31