am f913ff3f: Merge "Force set resolved method for static invokes"

* commit 'f913ff3f7e37c1b2c7f2fb96120c2b5b25d962a7':
  Force set resolved method for static invokes