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

* commit '6821d0b62350d09247377f86d3cbd6cb8b2e7a6b':
  Fix build: Remove -Wold-style-cast