Merge "logd: Adjust to match defacto coding style"