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

Change-Id: I8d3e05cbeb2e9273903a12a00e4a99d39aa249b7