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

Change-Id: I7836999d01bf4ef814c9aa8327027120ff8d54a7