Merge "logcat: permit transition to Android.bp"