Merge "ART: Use dex2oat watchdog in host run-test" am: e913cd027a
am: d5acdd84ac

Change-Id: I55725e1a0e092692e63c31aae03373ebfd107ddd