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

* commit '8e34cc80ea8116cd09cfb44a28e0b5a66e7ecc0d':