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

Change-Id: Ifda61b0876aee10afa89a2d494b24c42137f467d