Merge "logd: fix memory leak due to slow reader" am: 02ac44c993
am: 40616c8531

Change-Id: I47725e86b78832c6d183bf1db0c2fbe1203cedf1