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

Change-Id: I0e9bb49214d69c3a87c226f24480ea9800f680b1