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

Change-Id: I966ae7f468885ca2c9d1d633ef40def3a3e8627a