Merge "Remove liblogcat." am: 28a3160c07
am: 78c7ac2d95

Change-Id: I227a9d0176c6be6be6b1f2ed529b833cdc7e02e3