Merge "Increase dex2oat timeout for run-tests"
am: f35bb20d7d

Change-Id: I6f131e9096971877bf33a83f9ba35319c0dad8d2