Merge "Increase dex2oat timeouts for debug builds"