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

* commit '11cd49d284464e7fb972e0475e7a71281ba53212':
  Fix build: Remove -Wold-style-cast