Merge "versioner: Update libc.map.txt to match annotations"