Merge "Adding per-method clang thread safety annotations"