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

Change-Id: I293e027247e5cf087623ed06fa65ed5e3f17a1a4