Merge "Add virtual dtor for virtual classes"
am: 27f61a94d6

Change-Id: Ic45e81f483e31b01abe6195bd63174c8253b82ae