Merge "logcat: build cleanup"
am: 9dead6deec

* commit '9dead6deec6d97214e16ae931900879a797ffea3':
  logcat: build cleanup