Merge "Fix adb -d/-e error reporting."