Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev