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

Change-Id: Ibe96ba994465f1bab6761306139a070083305976