am 6724a953: Merge "Increase dex2oat timeouts for debug builds"

* commit '6724a9531c92368491dd17937d0087f73a7c0642':
  Increase dex2oat timeouts for debug builds