Initial support for adding virtuals with structural redefinition
am: 283bb322de

Change-Id: Ieeb60e0e7d4cfaab766ee328a80a7220166592da