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

Change-Id: I4d5859f0e9974e6084b7dfb5ab1e22bbb33f4778