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

Change-Id: I516f98ad0804c87e6dcbf93e5f699d3e17e5b1cc