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

Change-Id: Id11adfa25f4dd6d00c92bd411451b2d4cef3ca87