Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d8689
am: 41a117dbcb

Change-Id: I26948cf98f7bbd4383e79e09bdde65c612dabadf