Get rid of IConsoleReader without re-breaking Eclipse

Bug: 5642953
Bug: 6205785
Change-Id: I915f973df8729768a1d74bc18a6c022616e12862
2 files changed