Merge "Add virtual dtor for virtual classes" am: 27f61a94d6 am: 2d7813a4a7
am: 2807036b09

Change-Id: I3723483c2aac5580a7db3256a39eca278a3ee9fb