am 076f5479: Merge "Use headers from adb."

* commit '076f5479b592fc02f2f3e5436cad06b0a35d0521':
  Use headers from adb.