am 9613bd32: am 4eb6c71e: Merge "Move adb_main to its own file."

* commit '9613bd32f5d19476063e4c546ad806385eed203c':
  Move adb_main to its own file.