Merge "logd: optimize code hotspots"