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

* commit '5e6df5ab2a40d2562bf06b152b5c11bd3be0d341':
  Make adb_api.h safe to include first.