Merge "Fix race in method jitting for 597-deopt-invoke-stub"
am: a6684ca4d6

Change-Id: I9f85f69e3b7f4b2c2f6910dad1587012a529337e