Merge "Revert "Propagate flags to ShouldHaveEmbeddedVTable""