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

Change-Id: I7fabb629a6debc75101f20a89f5e85bccec80318