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

Change-Id: I166ba78cdd77f1c29a7ac681692324e012401a4e