Merge "build: add logd"