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

Change-Id: I1048bf7c391b1570845b99e7e2846eb71e2c3160