Merge "ART: Add timeout to host gtests"
am: 3c9d3033b5

Change-Id: I3e402d79b941179766c9f65ed6c8231817bf5c1e