am 8ec6e52e: Merge "adb: use correct header file."

* commit '8ec6e52efcad8c09039af4c31543613c815a7686':
  adb: use correct header file.