Merge "A native method may be running and have the resolution stub."
am: 8fa2ae3900

* commit '8fa2ae390010351d055037e0843f908597c7f2bf':
  A native method may be running and have the resolution stub.