Merge "adb: don't use <error.h>." am: 33eb652783
am: 78dc75bbbe

Change-Id: I2845f43839bab0edeeb2e10e2a5319b159656773