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

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