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

Change-Id: Idea820b1fe20c32b6d127605b19bb0d931116556