am 4371d8c5: am 9ae0abb2: am 3445cfe2: Merge "Reapply -Wold-style-cast"

* commit '4371d8c5ce1c15946fb52e60244f218b62e6036a':
  Reapply -Wold-style-cast