am 7ce263a8: Merge "Make adb_api.h safe to include first."

* commit '7ce263a8512d2abe92957061c55fae383af88d44':
  Make adb_api.h safe to include first.