Merge "versioner: Fix C11 threads.h" am: 8292d04da5
am: 39268e56eb

Change-Id: I14dee3b0308fddf2bedeb9e0914bdf4e21dfaa51