Revert^4 "Allow structural redefinition on non-final classes."
am: 270db1ce48

Change-Id: Ie6464ea832a46de62984bbcc5dd75384dec19024