Merge "libcutils: Fix thread ID on macOS"