Merge "Stop using syscall() to get tid" am: 6535e9fa2b am: f3d07a4bcf

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1781459

Change-Id: Iaa2dcc1fbba83bf9cd68259ec6d04e15367b8668