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

Change-Id: I33b77e3daef7e7778cce6b05a36b9710f6209af5