Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d8689 am: 41a117dbcb am: 842928b4bd
am: 7952963fb0

Change-Id: I8760811a62eaa21b8c07fb628190eae250286dc2