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

* commit '43162fe50cb2e2e7861df97380fad815a54dac2e':
  Use headers from adb.