Merge "logcat: transition to Android.bp" am: ad7f1bc0b3 am: b5a69e8e70 am: d544b318fb am: 2dbdb62d09
am: b0ec312862

Change-Id: I9778909a5651e615e3f5d4228c7a5ba086374810