Merge "Dx: use context out/err everywhere."
am: e67321b84f

Change-Id: I001d6aeb5163029e942bbf09f62e5c6d9b4a9905