Merge "logd: 64-bit compile issue"