am 372e3bee: am f64914d7: Merge "Move to newer clang annotations"

* commit '372e3beecafaaac5e2c063eb68beca9ab3684056':
  Move to newer clang annotations