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

Change-Id: I5a67884720e918b396e42ee8812f4d10d8ca74bc