Merge "ART: Slow down dex2oat for watchdog test"
am: 9216156f27

Change-Id: I40ac8ebc69043c178dc1ec583753ae8d913a13aa