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

Change-Id: I9bca83a6bdf1beffabce85c93860637a5967d205