Revert "Remove finalizable restriction on structural redefinition"
am: 0b1afb7c63

Change-Id: I6cb041292cfc86ec88f04d707b70bb7a9b3ccb61