Merge "libcutils: Fix thread ID on macOS" am: 6958506e82
am: bdee15ef71

Change-Id: Iac6a73e1b7dfb387cd53798824575ca29b24ee04