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

Change-Id: I84255752fb4d61d93391bf2d3b50458bf000450e