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

Change-Id: Ie9774d397d53d0ab611580e0b119d2433e702c58