Merge "logcat: transition to Android.bp"