Merge "Only update declared methods during class redefinition." am: 4d0371a271
am: df066620b3

Change-Id: I0034f6cb324d59e44eab29fc92c1df5229a0082b