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

Change-Id: I67611dd3d14963c9134520e455f9d2e3aa13bca2