Merge "Move to newer clang annotations"