Merge "logcat: build cleanup" am: 9dead6deec
am: 03302be6e9

* commit '03302be6e93ce85a3ad07674f9d36a608ea80440':
  logcat: build cleanup