Revert^3 "Initial support for adding virtuals with structural redefinition"
am: 2f8c1ac61b

Change-Id: I309ec81d4d0ef3b3c100a5a5a40747db8e2069b0