Merge "Make adb_api.h safe to include first."