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

Change-Id: I08087fa9367d68a78ff43d7b81513177948ee640