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