Merge "logcat: do not report security buffer errors" am: 13c15e05d0 am: 8b844b98e3
am: 8319fcf9b3

Change-Id: I7b0463c3d7e7284d479d7c9057a037e7754f169c