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

Change-Id: I93f6add52dd6bdff30e8bc5709deded1b6e1ef14