Merge "Increase test 961 dex2oat timeout to 2 minutes"