Revert "Allow structural redefinition on non-final classes."
am: 88b1c83080

Change-Id: I3a1e2814352018a584e9ee8ffe052c175cb150e2