Merge "Increase dex2oat timeout for run-tests"