Merge "ART: Make dex2oat watchdog configurable" am: a6dfa573fa
am: b34a934ebf

Change-Id: I274e45330d11d9c76db01e15e2905e1b694a8d63