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

* commit '844306bd9cb3c8b3e514e5d91e9514556e8f95f4':
  adb: use correct header file.