Allow structural redefinition on non-final classes. am: c47040d31c
am: c878c8ae47

Change-Id: I42b81b24fcdf2cb181b3521afad7276b00a74801