Merge "logcat: add 'device shut down' to error message upon EOF" am: 4862127432

Change-Id: Ic3708581f9d42ea6cb8fd38bf990509d43bfbf2e