merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.