Merge "adb: don't use <error.h>."