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

Change-Id: Id881383a0edd1b24c637e0b2ff2a611459f45487