Merge "adb: use delete on objects with destructors."
am: e504360f3d

Change-Id: I1ade6caf84ed8798db5ae194e52c9187789a885d