am 1407b286: Merge "Fix adb -d/-e error reporting."

* commit '1407b28628afec6c06eb6cb818f800083df668e1':
  Fix adb -d/-e error reporting.