am 1b1eb050: Merge "ART: Decrease dex2oat watchdog timeout"

* commit '1b1eb050a0ea0016558cccbb029f7255284bd54f':
  ART: Decrease dex2oat watchdog timeout