am f64914d7: Merge "Move to newer clang annotations"

* commit 'f64914d7392b7d35c7f35bc917b0797b9c4605ac':
  Move to newer clang annotations