am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"

* commit '25d2a1a916058634a23d89d287b18eb18c140081':
  Fix build: Remove -Wold-style-cast