Merge "ART: Turn on dex2oat watchdog on target" into lmp-dev