Revert "Revert^2 "Allow structural redefinition on non-final classes."" am: 664999a12d
am: 45f66226bc

Change-Id: I64dd0c795d21738a574a974714dd493281caeebe