Merge "Special case JIT update for native methods." am: c6805743f4
am: c80a188d7d

Change-Id: I4fd40affe18a3143f3e43182a42d62757af06628