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

* commit '9ae0abb2e6f03f44aa87d41c157099275a1e00c5':
  Reapply -Wold-style-cast