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

Change-Id: Iaa96cbc08c823114e0ea65a2f73107cb4a2e4382