Merge "Increase test 961 dex2oat timeout to 2 minutes"
am: 350546494d

Change-Id: Ibef02fbe2f87f433348ede69335ea0d4f2066dd1