Merge "ART: Use dex2oat watchdog in host run-test" am: e913cd027a am: d5acdd84ac am: 87d65a2d96
am: 96b41fd91a

Change-Id: I60da82230fd59c40a51e4ee1ef41b9ac682df28d