am 3445cfe2: Merge "Reapply -Wold-style-cast"

* commit '3445cfe2b2461441d377aff0b00edd82fdf4f1ec':
  Reapply -Wold-style-cast