Merge "ART: Relax failure requirements for dex2oat watchdog test"