Merge "logcat: permit transition to Android.bp" am: 374f753211
am: 1830c9596d

Change-Id: I0fbe9bf8f12c10ce30fddc2e1a3ed9c66b21c6ce