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

Change-Id: I15bbe4e10490c490670ff409b6dff90e89cc4aaf