Merge "adb: delete hellish hodgepodge." am: acc0a90869
am: fbe62c5aaf

Change-Id: I6126db1e3cbff7248de2a022808639b438782b78