Merge "logcat: build cleanup"