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

Change-Id: I349a1f369b0c2b3b0a22a1619e96128df99aae2d