am 277626e5: am 844306bd: am cc4499b6: Merge "adb: use correct header file."

* commit '277626e59dc0ccbf0337ec6615622f46e6f958fd':
  adb: use correct header file.