Revert "Initial support for adding virtuals with structural redefinition" am: d0e354e54d
am: 1d2c13a8a5

Change-Id: Ied5d14bf12045678b1a7c0966564b02a61d1f3be