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

Change-Id: Id785611a9620515eca973d3a20f0db62195aa886