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

Change-Id: I266391591b2504bc7199f7dd77e414d83d3c1ad4