Merge "logd: LogBufferElementKey use uint32_t for uid"