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

Change-Id: I9ec6334643253c7fb07916dcaab48c82a6112d77